Skip to:
Content

BuddyPress.org

Changeset 14070


Ignore:
Timestamp:
11/03/2024 06:19:06 PM (3 months ago)
Author:
espellcaste
Message:

A user is no longer de-authenticated when making REST API requests.

We are introducing a new BP_LoggedIn_User class to fetch data about a BuddyPress logged-in user. This new addition fixes an issue where a user could be de-authenticated when making REST API requests.

Props dcavins, DJPaul, johnjamesjacoby, and imath.

Closes https://github.com/buddypress/buddypress/pull/395
See #9229 and #9145
Fixes #7658

Location:
trunk
Files:
1 added
83 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-core/classes/class-bp-core-user.php

    r13893 r14070  
    101101
    102102    /**
    103      * The total number of blog posts posted by the user.
     103     * The total number of blog posts published by the user.
    104104     *
    105105     * @var integer
  • trunk/src/bp-core/classes/class-bp-core.php

    r14059 r14070  
    236236         */
    237237
    238         // Logged in user is the 'current_user'.
    239         $current_user = wp_get_current_user();
    240 
    241         // The user ID of the user who is currently logged in.
    242         $bp->loggedin_user     = new stdClass();
    243         $bp->loggedin_user->id = isset( $current_user->ID ) ? $current_user->ID : 0;
     238        // The user who is currently logged in.
     239        $bp->loggedin_user = new BP_LoggedIn_User();
    244240
    245241        /** Avatars **********************************************************
  • trunk/src/bp-groups/bp-groups-functions.php

    r14043 r14070  
    14531453
    14541454    if ( isset( $user_groups[ $group_id ] ) ) {
    1455         $is_member = $user_groups[ $group_id ]->id;
     1455        $is_member = (int) $user_groups[ $group_id ]->id;
    14561456    }
    14571457
  • trunk/src/bp-groups/classes/class-bp-groups-group.php

    r13987 r14070  
    125125     *
    126126     * @since 1.2.0
    127      * @var bool
     127     * @var int|bool
    128128     */
    129129    protected $is_member;
     
    621621     * @since 2.7.0
    622622     *
    623      * @return bool|int
     623     * @return bool|int ID of the membership if the user is member, otherwise false.
    624624     */
    625625    protected function get_is_member() {
     
    629629
    630630        $this->is_member = groups_is_user_member( bp_loggedin_user_id(), $this->id );
     631
    631632        return $this->is_member;
    632633    }
  • trunk/src/bp-members/classes/class-bp-members-component.php

    r14059 r14070  
    234234        $user_id = bp_loggedin_user_id();
    235235
    236         /** Logged in user ***************************************************
    237          */
    238 
    239         // The core userdata of the user who is currently logged in.
    240         $bp->loggedin_user->userdata = bp_core_get_core_userdata( $user_id );
    241 
    242         // Fetch the full name for the logged in user.
    243         $bp->loggedin_user->fullname = isset( $bp->loggedin_user->userdata->display_name ) ? $bp->loggedin_user->userdata->display_name : '';
    244 
    245         // Hits the DB on single WP installs so get this separately.
    246         $bp->loggedin_user->is_super_admin = $bp->loggedin_user->is_site_admin = is_super_admin( $user_id );
    247 
    248         // The domain for the user currently logged in. eg: http://example.com/members/andy.
    249         $bp->loggedin_user->domain = bp_members_get_user_url( $user_id );
    250 
    251236        /**
    252237         * Set the Displayed user for the classic BuddyPress. This should only be the case when the
     
    255240         */
    256241        if ( bp_displayed_user_id() ) {
    257             // We're viewing a speciific user, switch the ID to use for the Nav to this one.
     242            // We're viewing a specific user, switch the ID to use for the Nav to this one.
    258243            $user_id = bp_displayed_user_id();
    259244
  • trunk/src/bp-xprofile/bp-xprofile-functions.php

    r14068 r14070  
    749749    }
    750750
    751     if ( bp_loggedin_user_id() ) {
    752         buddypress()->loggedin_user->fullname = bp_core_get_user_displayname( bp_loggedin_user_id() );
    753     }
    754 
    755751    if ( bp_displayed_user_id() ) {
    756752        buddypress()->displayed_user->fullname = bp_core_get_user_displayname( bp_displayed_user_id() );
  • trunk/src/class-buddypress.php

    r14059 r14070  
    728728            'BP_REST_Attachments'              => 'core',
    729729            'BP_Admin_Types'                   => 'core',
     730            'BP_LoggedIn_User'                 => 'core',
    730731            'BP_Optout'                        => 'core',
    731732            'BP_Optouts_List_Table'            => 'core',
  • trunk/tests/phpunit/includes/testcase.php

    r13980 r14070  
    155155        $bp->current_user          = new stdClass();
    156156        $bp->displayed_user        = new stdClass();
    157         $bp->loggedin_user         = new stdClass();
     157        $bp->loggedin_user         = new BP_LoggedIn_User();
    158158        $bp->pages                 = array();
    159159        $bp->groups->types         = array();
     
    239239     * user during tests. BP caches the current user differently, so we
    240240     * have to do a bit more work to change it
     241     *
     242     * @deprecated 15.0.0
    241243     */
    242244    public static function set_current_user( $user_id ) {
    243         $bp = buddypress();
    244 
    245         $bp->loggedin_user->id             = $user_id;
    246         $bp->loggedin_user->fullname       = bp_core_get_user_displayname( $user_id );
    247         $bp->loggedin_user->is_super_admin = is_super_admin( $user_id );
    248         $bp->loggedin_user->domain         = bp_members_get_user_url( $user_id );
    249         $bp->loggedin_user->userdata       = bp_core_get_core_userdata( $user_id );
    250 
    251245        wp_set_current_user( $user_id );
    252246    }
  • trunk/tests/phpunit/testcases/activity/functions.php

    r13980 r14070  
    14161416        // bp_activity_add_user_favorite() requires a logged-in user.
    14171417        $current_user = bp_loggedin_user_id();
    1418         self::set_current_user( $u );
     1418        wp_set_current_user( $u );
    14191419
    14201420        $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
     
    14241424        $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
    14251425
    1426         self::set_current_user( $current_user );
     1426        wp_set_current_user( $current_user );
    14271427    }
    14281428
     
    14371437        // bp_activity_add_user_favorite() requires a logged-in user.
    14381438        $current_user = bp_loggedin_user_id();
    1439         self::set_current_user( $u );
     1439        wp_set_current_user( $u );
    14401440        $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
    14411441
    1442         self::set_current_user( $current_user );
     1442        wp_set_current_user( $current_user );
    14431443    }
    14441444
     
    14541454        // bp_activity_add_user_favorite() requires a logged-in user.
    14551455        $current_user = bp_loggedin_user_id();
    1456         self::set_current_user( $u1 );
     1456        wp_set_current_user( $u1 );
    14571457
    14581458        // Only favorite for user 1
     
    14631463        $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
    14641464
    1465         self::set_current_user( $current_user );
     1465        wp_set_current_user( $current_user );
    14661466    }
    14671467
     
    14761476        // bp_activity_add_user_favorite() requires a logged-in user.
    14771477        $current_user = bp_loggedin_user_id();
    1478         self::set_current_user( $u1 );
     1478        wp_set_current_user( $u1 );
    14791479
    14801480        // Only favorite for user 1
     
    14901490        $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
    14911491
    1492         self::set_current_user( $current_user );
     1492        wp_set_current_user( $current_user );
    14931493    }
    14941494
     
    16211621        $this->assertTrue( bp_activity_user_can_read( $o, $u ) );
    16221622
    1623         self::set_current_user( $u2 );
     1623        wp_set_current_user( $u2 );
    16241624        $this->assertTrue( bp_activity_user_can_read( $o, $u2 ) );
    16251625    }
     
    16591659        bp_activity_mark_as_spam( $o );
    16601660
    1661         self::set_current_user( $u2 );
     1661        wp_set_current_user( $u2 );
    16621662        $this->assertTrue( bp_activity_user_can_read( $o, $u2 ) );
    16631663    }
  • trunk/tests/phpunit/testcases/activity/notifications.php

    r13980 r14070  
    2020        $this->u1 = self::factory()->user->create();
    2121        $this->u2 = self::factory()->user->create();
    22         self::set_current_user( $this->u1 );
     22        wp_set_current_user( $this->u1 );
    2323
    2424        /**
     
    3232
    3333    public function tear_down() {
    34         self::set_current_user( $this->current_user );
     34        wp_set_current_user( $this->current_user );
    3535        $this->set_permalink_structure( $this->permalink_structure );
    3636
     
    9090
    9191        // Log out
    92         self::set_current_user( 0 );
     92        wp_set_current_user( 0 );
    9393
    9494        // Go to the activity permalink page
     
    110110        $this->assertEquals( array( $this->a1 ), wp_list_pluck( $notifications, 'item_id' ) );
    111111
    112         self::set_current_user( $this->u1 );
     112        wp_set_current_user( $this->u1 );
    113113    }
    114114
     
    129129
    130130        // Switch user
    131         self::set_current_user( $this->u2 );
     131        wp_set_current_user( $this->u2 );
    132132
    133133        // Go to the activity permalink page
     
    149149        $this->assertEquals( array( $this->a1 ), wp_list_pluck( $notifications, 'item_id' ) );
    150150
    151         self::set_current_user( $this->u1 );
     151        wp_set_current_user( $this->u1 );
    152152    }
    153153
     
    202202
    203203        // Log out
    204         self::set_current_user( 0 );
     204        wp_set_current_user( 0 );
    205205
    206206        // Go to the My Activity page
     
    223223
    224224        // clean up
    225         self::set_current_user( $this->u1 );
     225        wp_set_current_user( $this->u1 );
    226226    }
    227227
     
    242242
    243243        // Log out
    244         self::set_current_user( $this->u2 );
     244        wp_set_current_user( $this->u2 );
    245245
    246246        // Go to the My Activity page
     
    263263
    264264        // clean up
    265         self::set_current_user( $this->u1 );
     265        wp_set_current_user( $this->u1 );
    266266    }
    267267
     
    444444
    445445        // Attempt to mark 'comment_reply' notifications as read for user 2.
    446         self::set_current_user( $this->u2 );
     446        wp_set_current_user( $this->u2 );
    447447        foreach ( $u2_notifications as $i => $n ) {
    448448            $n = bp_activity_format_notifications( $n->component_action, $n->item_id, $n->secondary_item_id, 1, 'array', $n->id );
     
    471471        $u3 = self::factory()->user->create();
    472472
    473         self::set_current_user( $u1 );
     473        wp_set_current_user( $u1 );
    474474        $userdata = get_userdata( $u1 );
    475475
     
    487487        ) );
    488488
    489         self::set_current_user( $u2 );
     489        wp_set_current_user( $u2 );
    490490        $userdata = get_userdata( $u2 );
    491491
     
    503503        self::factory()->comment->update_object( $c1, array( 'comment_approved' => 1 ) );
    504504
    505         self::set_current_user( $u3 );
     505        wp_set_current_user( $u3 );
    506506        $userdata = get_userdata( $u3 );
    507507
     
    543543
    544544        // Reset.
    545         self::set_current_user( $old_user );
     545        wp_set_current_user( $old_user );
    546546        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    547547        remove_filter( 'comment_flood_filter', '__return_false' );
  • trunk/tests/phpunit/testcases/activity/template.php

    r14026 r14070  
    1212        $u             = self::factory()->user->create();
    1313        $original_user = bp_loggedin_user_id();
    14         self::set_current_user( $u );
     14        wp_set_current_user( $u );
    1515
    1616        $a = self::factory()->activity->create(
     
    2626
    2727        // Logged-out user can't delete
    28         self::set_current_user( 0 );
     28        wp_set_current_user( 0 );
    2929        $this->assertFalse( bp_activity_user_can_delete( $activity ) );
    3030
    3131        // Miscellaneous user can't delete
    3232        $misc_user = self::factory()->user->create();
    33         self::set_current_user( $misc_user );
     33        wp_set_current_user( $misc_user );
    3434        $this->assertFalse( bp_activity_user_can_delete( $activity ) );
    3535
     
    4545        $bp->is_single_item = $is_single_item;
    4646        $bp->is_item_admin  = $is_item_admin;
    47         self::set_current_user( $original_user );
     47        wp_set_current_user( $original_user );
    4848    }
    4949
     
    5555        $old_user = get_current_user_id();
    5656        $u        = self::factory()->user->create();
    57         self::set_current_user( $u );
     57        wp_set_current_user( $u );
    5858
    5959        // create an activity update for the user
     
    7575
    7676        // reset
    77         self::set_current_user( $old_user );
     77        wp_set_current_user( $old_user );
    7878    }
    7979
     
    105105
    106106        $current_user = bp_loggedin_user_id();
    107         self::set_current_user( $user_id );
     107        wp_set_current_user( $user_id );
    108108
    109109        bp_activity_add_user_favorite( $a1, $user_id );
    110110        bp_activity_add_user_favorite( $a2, $user_id );
    111111
    112         self::set_current_user( $current_user );
     112        wp_set_current_user( $current_user );
    113113
    114114        // groan. It sucks that you have to invoke the global
     
    159159        // save the current user and override logged-in user
    160160        $old_user = get_current_user_id();
    161         self::set_current_user( $u1 );
     161        wp_set_current_user( $u1 );
    162162
    163163        $now = time();
     
    209209        // clean up!
    210210        $activities_template = null;
    211         self::set_current_user( $old_user );
     211        wp_set_current_user( $old_user );
    212212    }
    213213
     
    11521152        $u3 = self::factory()->user->create();
    11531153
    1154         self::set_current_user( $u1 );
     1154        wp_set_current_user( $u1 );
    11551155
    11561156        $g = self::factory()->group->create(
     
    12121212        $u3 = self::factory()->user->create();
    12131213
    1214         self::set_current_user( $u1 );
     1214        wp_set_current_user( $u1 );
    12151215
    12161216        $g = self::factory()->group->create(
  • trunk/tests/phpunit/testcases/activity/test-controller.php

    r14026 r14070  
    3232     */
    3333    public function test_get_items() {
    34         $this->bp::set_current_user( $this->user );
     34        wp_set_current_user( $this->user );
    3535
    3636        $this->bp::factory()->activity->create_many( 3 );
     
    8383        );
    8484
    85         $this->bp::set_current_user( $this->user );
     85        wp_set_current_user( $this->user );
    8686
    8787        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    106106     */
    107107    public function test_get_items_with_invalid_type() {
    108         $this->bp::set_current_user( $this->user );
     108        wp_set_current_user( $this->user );
    109109
    110110        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    159159
    160160        $u = static::factory()->user->create();
    161         $this->bp::set_current_user( $u );
     161        wp_set_current_user( $u );
    162162
    163163        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    224224
    225225        $u = static::factory()->user->create();
    226         $this->bp::set_current_user( $u );
     226        wp_set_current_user( $u );
    227227
    228228        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    247247
    248248        $u = static::factory()->user->create();
    249         $this->bp::set_current_user( $u );
     249        wp_set_current_user( $u );
    250250
    251251        // Current user is $u.
     
    308308
    309309        $u = static::factory()->user->create();
    310         $this->bp::set_current_user( $u );
     310        wp_set_current_user( $u );
    311311
    312312        // Current user is $u.
     
    353353
    354354        $u = static::factory()->user->create();
    355         $this->bp::set_current_user( $u );
     355        wp_set_current_user( $u );
    356356
    357357        // Current user is $u.
     
    413413
    414414        $u = static::factory()->user->create();
    415         $this->bp::set_current_user( $this->user );
     415        wp_set_current_user( $this->user );
    416416
    417417        $g1 = $this->bp::factory()->group->create(
     
    435435        );
    436436
    437         $this->bp::set_current_user( $u );
     437        wp_set_current_user( $u );
    438438
    439439        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    461461
    462462        $u = static::factory()->user->create();
    463         $this->bp::set_current_user( $this->user );
     463        wp_set_current_user( $this->user );
    464464
    465465        $g2 = $this->bp::factory()->group->create(
     
    483483        );
    484484
    485         $this->bp::set_current_user( $u );
     485        wp_set_current_user( $u );
    486486
    487487        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    509509
    510510        $u = static::factory()->user->create();
    511         $this->bp::set_current_user( $u );
     511        wp_set_current_user( $u );
    512512
    513513        // Current user is $u.
     
    551551    public function test_get_paginated_items() {
    552552        $u = static::factory()->user->create();
    553         $this->bp::set_current_user( $u );
     553        wp_set_current_user( $u );
    554554
    555555        $a = $this->bp::factory()->activity->create( array( 'user_id' => $u ) );
     
    582582    public function test_get_items_with_the_groups_scope() {
    583583        $u = static::factory()->user->create();
    584         $this->bp::set_current_user( $u );
     584        wp_set_current_user( $u );
    585585
    586586        $component = buddypress()->groups->id;
     
    634634     */
    635635    public function test_get_items_with_favorite() {
    636         $this->bp::set_current_user( $this->user );
     636        wp_set_current_user( $this->user );
    637637
    638638        $this->bp::factory()->activity->create_many( 2 );
     
    640640
    641641        $u = static::factory()->user->create();
    642         $this->bp::set_current_user( $u );
     642        wp_set_current_user( $u );
    643643
    644644        bp_activity_add_user_favorite( $a1, $u );
     
    660660    public function test_get_items_with_no_favorite() {
    661661        $u = static::factory()->user->create();
    662         $this->bp::set_current_user( $u );
     662        wp_set_current_user( $u );
    663663
    664664        $this->bp::factory()->activity->create_many( 3, array( 'user_id' => $u ) );
     
    683683     */
    684684    public function test_get_item() {
    685         $this->bp::set_current_user( $this->user );
     685        wp_set_current_user( $this->user );
    686686
    687687        $activity = $this->endpoint->get_activity_object( $this->activity_id );
     
    722722        $u1        = static::factory()->user->create();
    723723
    724         $this->bp::set_current_user( $u1 );
     724        wp_set_current_user( $u1 );
    725725
    726726        $g1 = $this->bp::factory()->group->create(
     
    767767        );
    768768
    769         $this->bp::set_current_user( $u2 );
     769        wp_set_current_user( $u2 );
    770770
    771771        $a1 = $this->bp::factory()->activity->create(
     
    800800        );
    801801
    802         $this->bp::set_current_user( $u2 );
     802        wp_set_current_user( $u2 );
    803803
    804804        $a1 = $this->bp::factory()->activity->create(
     
    845845
    846846        // Non-authenticated.
    847         $this->bp::set_current_user( 0 );
     847        wp_set_current_user( 0 );
    848848        $response = $this->server->dispatch( $request );
    849849        $this->assertEquals( 401, $response->get_status() );
     
    851851        // Not a member of the group.
    852852        $u = static::factory()->user->create();
    853         $this->bp::set_current_user( $u );
     853        wp_set_current_user( $u );
    854854
    855855        $response = $this->server->dispatch( $request );
     
    873873     */
    874874    public function test_render_item() {
    875         $this->bp::set_current_user( $this->user );
     875        wp_set_current_user( $this->user );
    876876
    877877        $a = $this->bp::factory()->activity->create(
     
    895895     */
    896896    public function test_render_item_with_embed_post() {
    897         $this->bp::set_current_user( $this->user );
     897        wp_set_current_user( $this->user );
    898898        $p = static::factory()->post->create();
    899899
     
    918918     */
    919919    public function test_create_item() {
    920         $this->bp::set_current_user( $this->user );
     920        wp_set_current_user( $this->user );
    921921
    922922        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    935935     */
    936936    public function test_rest_create_item() {
    937         $this->bp::set_current_user( $this->user );
     937        wp_set_current_user( $this->user );
    938938
    939939        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    952952     */
    953953    public function test_create_item_with_no_content() {
    954         $this->bp::set_current_user( $this->user );
     954        wp_set_current_user( $this->user );
    955955
    956956        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    984984     */
    985985    public function test_create_item_in_a_group() {
    986         $this->bp::set_current_user( $this->user );
     986        wp_set_current_user( $this->user );
    987987        $g = $this->bp::factory()->group->create(
    988988            array(
     
    10121012     */
    10131013    public function test_create_item_in_a_private_group() {
    1014         $this->bp::set_current_user( $this->user );
     1014        wp_set_current_user( $this->user );
    10151015        $g = $this->bp::factory()->group->create(
    10161016            array(
     
    10411041     */
    10421042    public function test_create_item_in_an_hidden_group() {
    1043         $this->bp::set_current_user( $this->user );
     1043        wp_set_current_user( $this->user );
    10441044        $g = $this->bp::factory()->group->create(
    10451045            array(
     
    10701070     */
    10711071    public function test_create_item_and_get_comment() {
    1072         $this->bp::set_current_user( $this->user );
     1072        wp_set_current_user( $this->user );
    10731073
    10741074        $a = $this->bp::factory()->activity->create(
     
    10821082        $u = static::factory()->user->create();
    10831083
    1084         $this->bp::set_current_user( $u );
     1084        wp_set_current_user( $u );
    10851085
    10861086        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    11431143        );
    11441144
    1145         $this->bp::set_current_user( $u );
     1145        wp_set_current_user( $u );
    11461146
    11471147        // Add a reply to c
     
    11871187     */
    11881188    public function test_create_item_and_get_comment_in_a_group() {
    1189         $this->bp::set_current_user( $this->user );
     1189        wp_set_current_user( $this->user );
    11901190
    11911191        $g = $this->bp::factory()->group->create(
     
    12061206        $u = static::factory()->user->create();
    12071207
    1208         $this->bp::set_current_user( $u );
     1208        wp_set_current_user( $u );
    12091209        groups_join_group( $g, $u );
    12101210
     
    12481248     */
    12491249    public function test_create_item_with_no_content_in_a_group() {
    1250         $this->bp::set_current_user( $this->user );
     1250        wp_set_current_user( $this->user );
    12511251        $g = $this->bp::factory()->group->create(
    12521252            array(
     
    12771277     */
    12781278    public function test_create_blog_post_item() {
    1279         $this->bp::set_current_user( $this->user );
     1279        wp_set_current_user( $this->user );
    12801280        $p = static::factory()->post->create();
    12811281
     
    13201320     */
    13211321    public function test_update_item() {
    1322         $this->bp::set_current_user( $this->user );
     1322        wp_set_current_user( $this->user );
    13231323
    13241324        $activity = $this->endpoint->get_activity_object( $this->activity_id );
     
    13521352        $activity_id   = $this->bp::factory()->activity->create( array( 'recorded_time' => $activity_date ) );
    13531353
    1354         $this->bp::set_current_user( $this->user );
     1354        wp_set_current_user( $this->user );
    13551355
    13561356        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $activity_id ) );
     
    13741374     */
    13751375    public function test_update_item_posted_in_a_group() {
    1376         $this->bp::set_current_user( $this->user );
     1376        wp_set_current_user( $this->user );
    13771377
    13781378        $g = $this->bp::factory()->group->create(
     
    14251425     */
    14261426    public function test_update_item_invalid_id() {
    1427         $this->bp::set_current_user( $this->user );
     1427        wp_set_current_user( $this->user );
    14281428
    14291429        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    14611461
    14621462        $u2 = static::factory()->user->create();
    1463         $this->bp::set_current_user( $u2 );
     1463        wp_set_current_user( $u2 );
    14641464
    14651465        $activity = $this->endpoint->get_activity_object( $a );
     
    14841484        $a = $this->bp::factory()->activity->create( array( 'user_id' => $u ) );
    14851485
    1486         $this->bp::set_current_user( $u );
     1486        wp_set_current_user( $u );
    14871487
    14881488        $activity = $this->endpoint->get_activity_object( $a );
     
    15061506        $a = $this->bp::factory()->activity->create( array( 'user_id' => $u ) );
    15071507
    1508         $this->bp::set_current_user( $u );
     1508        wp_set_current_user( $u );
    15091509
    15101510        $activity = $this->endpoint->get_activity_object( $a );
     
    15281528     */
    15291529    public function test_delete_item() {
    1530         $this->bp::set_current_user( $this->user );
     1530        wp_set_current_user( $this->user );
    15311531
    15321532        $activity_id = $this->bp::factory()->activity->create(
     
    15561556     */
    15571557    public function test_delete_item_invalid_id() {
    1558         $this->bp::set_current_user( $this->user );
     1558        wp_set_current_user( $this->user );
    15591559
    15601560        $request = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    15871587
    15881588        $u2 = static::factory()->user->create();
    1589         $this->bp::set_current_user( $u2 );
     1589        wp_set_current_user( $u2 );
    15901590
    15911591        $activity = $this->endpoint->get_activity_object( $activity_id );
     
    16101610
    16111611        $u = static::factory()->user->create();
    1612         $this->bp::set_current_user( $u );
     1612        wp_set_current_user( $u );
    16131613
    16141614        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d/favorite', $a ) );
     
    16381638
    16391639        $u = static::factory()->user->create();
    1640         $this->bp::set_current_user( $u );
     1640        wp_set_current_user( $u );
    16411641
    16421642        bp_activity_add_user_favorite( $a, $u );
     
    16641664
    16651665        $u = static::factory()->user->create();
    1666         $this->bp::set_current_user( $u );
     1666        wp_set_current_user( $u );
    16671667
    16681668        add_filter( 'bp_activity_can_favorite', '__return_false' );
     
    16791679
    16801680    public function test_prepare_item() {
    1681         $this->bp::set_current_user( $this->user );
     1681        wp_set_current_user( $this->user );
    16821682
    16831683        $activity = $this->endpoint->get_activity_object( $this->activity_id );
     
    17161716        );
    17171717
    1718         $this->bp::set_current_user( $this->user );
     1718        wp_set_current_user( $this->user );
    17191719        $expected = 'bar_value';
    17201720
     
    17601760        );
    17611761
    1762         $this->bp::set_current_user( $this->user );
     1762        wp_set_current_user( $this->user );
    17631763        $expected = 'foo_value';
    17641764        $a_id     = $this->bp::factory()->activity->create();
  • trunk/tests/phpunit/testcases/admin/functions.php

    r13980 r14070  
    99        parent::set_up();
    1010        $this->old_current_user = get_current_user_id();
    11         self::set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
     11        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
    1212
    1313        if ( ! function_exists( 'bp_admin' ) ) {
     
    2121
    2222    public function tear_down() {
    23         self::set_current_user( $this->old_current_user );
     23        wp_set_current_user( $this->old_current_user );
    2424        parent::tear_down();
    2525    }
  • trunk/tests/phpunit/testcases/blogs/activity.php

    r13980 r14070  
    300300        $old_user = get_current_user_id();
    301301        $u = self::factory()->user->create();
    302         self::set_current_user( $u );
     302        wp_set_current_user( $u );
    303303        $userdata = get_userdata( $u );
    304304
     
    338338        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    339339
    340         self::set_current_user( $old_user );
     340        wp_set_current_user( $old_user );
    341341    }
    342342
     
    348348        $old_user = get_current_user_id();
    349349        $u = self::factory()->user->create();
    350         self::set_current_user( $u );
     350        wp_set_current_user( $u );
    351351        $userdata = get_userdata( $u );
    352352
     
    386386        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    387387
    388         self::set_current_user( $old_user );
     388        wp_set_current_user( $old_user );
    389389    }
    390390
     
    396396        $old_user = get_current_user_id();
    397397        $u = self::factory()->user->create();
    398         self::set_current_user( $u );
     398        wp_set_current_user( $u );
    399399        $userdata = get_userdata( $u );
    400400
     
    446446        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    447447
    448         self::set_current_user( $old_user );
     448        wp_set_current_user( $old_user );
    449449    }
    450450
     
    456456        $old_user = get_current_user_id();
    457457        $u = self::factory()->user->create();
    458         self::set_current_user( $u );
     458        wp_set_current_user( $u );
    459459        $userdata = get_userdata( $u );
    460460
     
    503503        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    504504
    505         self::set_current_user( $old_user );
     505        wp_set_current_user( $old_user );
    506506    }
    507507
     
    513513        $old_user = get_current_user_id();
    514514        $u = self::factory()->user->create();
    515         self::set_current_user( $u );
     515        wp_set_current_user( $u );
    516516        $userdata = get_userdata( $u );
    517517
     
    560560        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    561561
    562         self::set_current_user( $old_user );
     562        wp_set_current_user( $old_user );
    563563    }
    564564
     
    570570        $old_user = get_current_user_id();
    571571        $u = self::factory()->user->create();
    572         self::set_current_user( $u );
     572        wp_set_current_user( $u );
    573573        $userdata = get_userdata( $u );
    574574
     
    614614        remove_action( 'bp_activity_before_save', array( $this, 'set_activity_to_spam' ) );
    615615
    616         self::set_current_user( $old_user );
     616        wp_set_current_user( $old_user );
    617617    }
    618618
     
    626626        $reset_at = isset( $GLOBALS['activities_template'] ) ? $GLOBALS['activities_template'] : null;
    627627
    628         self::set_current_user( $u );
     628        wp_set_current_user( $u );
    629629
    630630        // let's use activity comments instead of single "new_blog_comment" activity items
     
    673673        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    674674        $GLOBALS['activities_template'] = $reset_at;
    675         self::set_current_user( $old_user );
     675        wp_set_current_user( $old_user );
    676676    }
    677677
     
    685685        $reset_at = isset( $GLOBALS['activities_template'] ) ? $GLOBALS['activities_template'] : null;
    686686
    687         self::set_current_user( $u );
     687        wp_set_current_user( $u );
    688688
    689689        // let's use activity comments instead of single "new_blog_comment" activity items
     
    731731        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    732732        $GLOBALS['activities_template'] = $reset_at;
    733         self::set_current_user( $old_user );
     733        wp_set_current_user( $old_user );
    734734    }
    735735
  • trunk/tests/phpunit/testcases/blogs/cache.php

    r13980 r14070  
    9999        // Switch user so we have access to non-public blogs
    100100        $old_user = get_current_user_id();
    101         self::set_current_user( $u );
     101        wp_set_current_user( $u );
    102102
    103103        $b1 = self::factory()->blog->create();
     
    177177        }
    178178
    179         self::set_current_user( $old_user );
     179        wp_set_current_user( $old_user );
    180180    }
    181181
     
    193193        // Switch user so we have access to non-public blogs
    194194        $old_user = get_current_user_id();
    195         self::set_current_user( $u );
     195        wp_set_current_user( $u );
    196196
    197197        $b1 = self::factory()->blog->create();
     
    230230        $this->assertFalse( wp_cache_get( $b2, 'bp_blog_meta' ) );
    231231
    232         self::set_current_user( $old_user );
     232        wp_set_current_user( $old_user );
    233233    }
    234234
  • trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php

    r13980 r14070  
    1414
    1515        $u = self::factory()->user->create();
    16         self::set_current_user( $u );
     16        wp_set_current_user( $u );
    1717        $b = self::factory()->blog->create( array(
    1818            'title' => 'The Foo Bar Blog',
     
    4444
    4545        $u = self::factory()->user->create();
    46         self::set_current_user( $u );
     46        wp_set_current_user( $u );
    4747        $b = self::factory()->blog->create( array(
    4848            'title' => 'The Foo Bar Blog',
     
    7474
    7575        $u = self::factory()->user->create();
    76         self::set_current_user( $u );
     76        wp_set_current_user( $u );
    7777        $b = self::factory()->blog->create( array(
    7878            'title' => 'The Foo Bar Blog',
     
    103103
    104104        $u = self::factory()->user->create();
    105         self::set_current_user( $u );
     105        wp_set_current_user( $u );
    106106        $b = self::factory()->blog->create( array(
    107107            'title' => 'Foo Bar Blog',
     
    131131
    132132        $u = self::factory()->user->create();
    133         self::set_current_user( $u );
     133        wp_set_current_user( $u );
    134134        $bs = array(
    135135            'foobar' => self::factory()->blog->create( array(
     
    176176        $this->assertTrue( 2 == count( $blogs['blogs'] ) );
    177177
    178         self::set_current_user( $old_user );
     178        wp_set_current_user( $old_user );
    179179    }
    180180
     
    189189        $old_user = get_current_user_id();
    190190        $u = self::factory()->user->create();
    191         self::set_current_user( $u );
     191        wp_set_current_user( $u );
    192192
    193193        $r = [
     
    230230        $old_user = get_current_user_id();
    231231        $u = self::factory()->user->create();
    232         self::set_current_user( $u );
     232        wp_set_current_user( $u );
    233233
    234234        $r = [
     
    273273        $old_user = get_current_user_id();
    274274        $u = self::factory()->user->create();
    275         self::set_current_user( $u );
     275        wp_set_current_user( $u );
    276276
    277277        $r = [
  • trunk/tests/phpunit/testcases/blogs/functions.php

    r13980 r14070  
    521521        $old_user = get_current_user_id();
    522522        $u = self::factory()->user->create();
    523         self::set_current_user( $u );
     523        wp_set_current_user( $u );
    524524        $userdata = get_userdata( $u );
    525525
     
    594594
    595595        // reset
    596         self::set_current_user( $old_user );
     596        wp_set_current_user( $old_user );
    597597    }
    598598
     
    606606        $old_user = get_current_user_id();
    607607        $u = self::factory()->user->create();
    608         self::set_current_user( $u );
     608        wp_set_current_user( $u );
    609609        $userdata = get_userdata( $u );
    610610
     
    657657
    658658        // reset
    659         self::set_current_user( $old_user );
     659        wp_set_current_user( $old_user );
    660660        remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
    661661    }
     
    668668        $old_user = get_current_user_id();
    669669        $u = self::factory()->user->create();
    670         self::set_current_user( $u );
     670        wp_set_current_user( $u );
    671671        $userdata = get_userdata( $u );
    672672
     
    766766        $old_user = get_current_user_id();
    767767        $u = self::factory()->user->create();
    768         self::set_current_user( $u );
     768        wp_set_current_user( $u );
    769769        $userdata = get_userdata( $u );
    770770        $this->activity_saved_comment_count = 0;
     
    819819        $this->activity_saved_comment_count = 0;
    820820        $this->comment_saved_count = 0;
    821         self::set_current_user( $old_user );
     821        wp_set_current_user( $old_user );
    822822    }
    823823
     
    830830        $old_user = get_current_user_id();
    831831        $u = self::factory()->user->create();
    832         self::set_current_user( $u );
     832        wp_set_current_user( $u );
    833833
    834834        // Get user details
     
    879879        $this->assertNotNull( $a1, 'Activity item was not created for existing blog post when recording post comment.' );
    880880
    881         self::set_current_user( $old_user );
     881        wp_set_current_user( $old_user );
    882882    }
    883883
     
    10051005
    10061006        $u = self::factory()->user->create();
    1007         self::set_current_user( $u );
     1007        wp_set_current_user( $u );
    10081008
    10091009        // Create three sites.
     
    10231023        $this->assertSame( 3, (int) $blogs['total'] );
    10241024
    1025         self::set_current_user( $old_user );
     1025        wp_set_current_user( $old_user );
    10261026    }
    10271027
     
    10411041
    10421042        $u = self::factory()->user->create();
    1043         self::set_current_user( $u );
     1043        wp_set_current_user( $u );
    10441044
    10451045        // Create three sites.
     
    10701070
    10711071        $_POST = $reset_post;
    1072         self::set_current_user( $old_user );
     1072        wp_set_current_user( $old_user );
    10731073    }
    10741074
     
    10881088
    10891089        $u = self::factory()->user->create();
    1090         self::set_current_user( $u );
     1090        wp_set_current_user( $u );
    10911091
    10921092        // Create three sites.
     
    11171117
    11181118        $_POST = $reset_post;
    1119         self::set_current_user( $old_user );
     1119        wp_set_current_user( $old_user );
    11201120    }
    11211121
  • trunk/tests/phpunit/testcases/blogs/test-blog-avatar-controller.php

    r14026 r14070  
    3939        );
    4040
    41         $this->bp::set_current_user( $u );
     41        wp_set_current_user( $u );
    4242
    4343        $blog_id = self::factory()->blog->create();
     
    9393        $u = $this->bp::factory()->user->create();
    9494
    95         $this->bp::set_current_user( $u );
     95        wp_set_current_user( $u );
    9696
    9797        $blog_id = self::factory()->blog->create();
     
    115115        $u = $this->bp::factory()->user->create();
    116116
    117         $this->bp::set_current_user( $u );
     117        wp_set_current_user( $u );
    118118
    119119        $blog_id  = self::factory()->blog->create();
     
    155155        $u = $this->bp::factory()->user->create();
    156156
    157         $this->bp::set_current_user( $u );
     157        wp_set_current_user( $u );
    158158
    159159        $blog_id = self::factory()->blog->create( array( 'meta' => array( 'public' => 1 ) ) );
    160160
    161         $this->bp::set_current_user( $current_user );
     161        wp_set_current_user( $current_user );
    162162
    163163        // Remove admins.
  • trunk/tests/phpunit/testcases/blogs/test-controller.php

    r14026 r14070  
    2727        $this->skipWithoutMultisite();
    2828
    29         $this->bp::set_current_user( $this->user );
     29        wp_set_current_user( $this->user );
    3030
    3131        self::factory()->blog->create_many( 2 );
     
    5252        $this->skipWithoutMultisite();
    5353
    54         $this->bp::set_current_user( $this->user );
     54        wp_set_current_user( $this->user );
    5555
    5656        $blog_id = self::factory()->blog->create(
     
    109109        $this->skipWithoutMultisite();
    110110
    111         $this->bp::set_current_user( $this->user );
     111        wp_set_current_user( $this->user );
    112112
    113113        $blog_id = self::factory()->blog->create(
     
    154154        $this->skipWithoutMultisite();
    155155
    156         $this->bp::set_current_user( $this->user );
     156        wp_set_current_user( $this->user );
    157157
    158158        $subdomain = 'cool-site.foo-bar';
     
    211211        buddypress()->site_options = $settings;
    212212
    213         $this->bp::set_current_user( $this->user );
     213        wp_set_current_user( $this->user );
    214214
    215215        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    260260        buddypress()->site_options = $settings;
    261261
    262         $this->bp::set_current_user( $this->user );
     262        wp_set_current_user( $this->user );
    263263
    264264        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    281281        $this->skipWithoutMultisite();
    282282
    283         $this->bp::set_current_user( $this->user );
     283        wp_set_current_user( $this->user );
    284284
    285285        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    365365
    366366        $u = $this->bp::factory()->user->create();
    367         $this->bp::set_current_user( $u );
     367        wp_set_current_user( $u );
    368368
    369369        $blog_id = self::factory()->blog->create(
  • trunk/tests/phpunit/testcases/core/caps.php

    r13980 r14070  
    2020
    2121    public function tear_down() {
    22         self::set_current_user( $this->reset_user_id );
     22        wp_set_current_user( $this->reset_user_id );
    2323        parent::tear_down();
    2424    }
     
    3232        $u = self::factory()->user->create();
    3333
    34         self::set_current_user( $u );
     34        wp_set_current_user( $u );
    3535
    3636        add_filter( 'user_has_cap', array( $this, 'grant_cap_foo' ), 10, 2 );
     
    5454        $u = self::factory()->user->create();
    5555
    56         self::set_current_user( $u );
     56        wp_set_current_user( $u );
    5757
    5858        add_filter( 'user_has_cap', array( $this, 'grant_cap_foo' ), 10, 2 );
     
    8888        );
    8989
    90         self::set_current_user( $u );
     90        wp_set_current_user( $u );
    9191
    9292        $this->assertTrue( bp_current_user_can( 'bp_moderate' ), 'Administrator can `bp_moderate` on default WordPress config' );
     
    108108        );
    109109
    110         self::set_current_user( $u );
     110        wp_set_current_user( $u );
    111111
    112112        $this->assertTrue( bp_current_user_can( 'bp_moderate' ), 'Users having a `manage_options` cap into their role can `bp_moderate`' );
     
    130130        );
    131131
    132         self::set_current_user( $u1 );
     132        wp_set_current_user( $u1 );
    133133
    134134        $email = self::factory()->post->create(
     
    140140        $this->assertTrue( current_user_can( 'edit_post', $email ), 'Administrator should be able to edit emails they created' );
    141141
    142         self::set_current_user( $u2 );
     142        wp_set_current_user( $u2 );
    143143
    144144        $this->assertTrue( current_user_can( 'edit_post', $email ), 'Administrator should be able to edit emails others created when BuddyPress is not network activated' );
     
    171171        switch_to_blog( $this->blog_id );
    172172
    173         self::set_current_user( $u1 );
     173        wp_set_current_user( $u1 );
    174174        $this->assertTrue( bp_current_user_can( 'bp_moderate' ), 'Only Super Admins can `bp_moderate` when BuddyPress is network activated' );
    175175
    176         self::set_current_user( $u2 );
     176        wp_set_current_user( $u2 );
    177177
    178178        $this->assertFalse( bp_current_user_can( 'bp_moderate' ), 'Regular Admins cannot `bp_moderate` when BuddyPress is network activated' );
     
    219219        restore_current_blog();
    220220
    221         self::set_current_user( $u1 );
     221        wp_set_current_user( $u1 );
    222222        $this->assertTrue( current_user_can( 'edit_post', $email ), 'Super Admins should be able to edit emails they created' );
    223223
    224         self::set_current_user( $u2 );
     224        wp_set_current_user( $u2 );
    225225        $this->assertFalse( current_user_can( 'edit_post', $email ), 'Administrator should not be able to edit emails others created when BuddyPress is network activated' );
    226226
  • trunk/tests/phpunit/testcases/core/class-bp-button.php

    r13980 r14070  
    2424    public function test_block_self_own_profile() {
    2525        $u = self::factory()->user->create();
    26         self::set_current_user( $u );
     26        wp_set_current_user( $u );
    2727        $this->set_permalink_structure( '/%postname%/' );
    2828
     
    4343    public function test_block_self_others_profile() {
    4444        $u1 = self::factory()->user->create();
    45         self::set_current_user( $u1 );
     45        wp_set_current_user( $u1 );
    4646        $this->set_permalink_structure( '/%postname%/' );
    4747
     
    7070        ) );
    7171
    72         self::set_current_user( $u1 );
     72        wp_set_current_user( $u1 );
    7373
    7474        $found = array();
     
    110110        ) );
    111111
    112         self::set_current_user( $u1 );
     112        wp_set_current_user( $u1 );
    113113
    114114        $found = array();
     
    150150        ) );
    151151
    152         self::set_current_user( $u1 );
     152        wp_set_current_user( $u1 );
    153153        $this->set_permalink_structure( '/%postname%/' );
    154154        $this->go_to( bp_members_get_user_url( $u1 ) );
  • trunk/tests/phpunit/testcases/core/class-bp-user-query.php

    r13980 r14070  
    101101
    102102        $old_user = get_current_user_id();
    103         self::set_current_user( $u1 );
     103        wp_set_current_user( $u1 );
    104104
    105105        // pass 'user_ids' to user query to trigger this bug
     
    112112
    113113        // clean up
    114         self::set_current_user( $old_user );
     114        wp_set_current_user( $old_user );
    115115    }
    116116
  • trunk/tests/phpunit/testcases/core/class-bp-walker-nav-menu.php

    r13980 r14070  
    1414
    1515        $this->user_id = self::factory()->user->create();
    16         self::set_current_user( $this->user_id );
     16        wp_set_current_user( $this->user_id );
    1717    }
    1818
    1919    public function tear_down() {
    20         self::set_current_user( $this->reset_user_id );
     20        wp_set_current_user( $this->reset_user_id );
    2121        parent::tear_down();
    2222    }
  • trunk/tests/phpunit/testcases/core/community-visibility.php

    r13980 r14070  
    1111        $this->old_user = get_current_user_id();
    1212        $this->logged_in_user = self::factory()->user->create();
    13         self::set_current_user( $this->logged_in_user );
     13        wp_set_current_user( $this->logged_in_user );
    1414
    1515        // Save a typical setting.
     
    2121
    2222    public function tear_down() {
    23         self::set_current_user( $this->old_user );
     23        wp_set_current_user( $this->old_user );
    2424        // Reset site to totally open.
    2525        delete_option( '_bp_community_visibility' );
  • trunk/tests/phpunit/testcases/core/invitations.php

    r14026 r14070  
    113113        $u2 = self::factory()->user->create();
    114114        $u3 = self::factory()->user->create();
    115         self::set_current_user( $u1 );
     115        wp_set_current_user( $u1 );
    116116
    117117        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    135135        $this->assertEqualSets( array( $i1, $i2 ), $invites );
    136136
    137         self::set_current_user( $old_current_user );
     137        wp_set_current_user( $old_current_user );
    138138    }
    139139
     
    143143        $u1 = self::factory()->user->create();
    144144        $u2 = self::factory()->user->create();
    145         self::set_current_user( $u1 );
     145        wp_set_current_user( $u1 );
    146146
    147147        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    159159        $this->assertEquals( $i1, $i2 );
    160160
    161         self::set_current_user( $old_current_user );
     161        wp_set_current_user( $old_current_user );
    162162    }
    163163
     
    169169        $u3 = self::factory()->user->create();
    170170
    171         self::set_current_user( $u1 );
     171        wp_set_current_user( $u1 );
    172172
    173173        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    204204        $this->assertEqualSets( array( $i1 ), $invite_ids );
    205205
    206         self::set_current_user( $old_current_user );
     206        wp_set_current_user( $old_current_user );
    207207    }
    208208
     
    213213        $u2 = self::factory()->user->create();
    214214        $u3 = self::factory()->user->create();
    215         self::set_current_user( $u1 );
     215        wp_set_current_user( $u1 );
    216216
    217217        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    240240        $this->assertEqualSets( array(), wp_list_pluck( $invites, 'id' ) );
    241241
    242         self::set_current_user( $old_current_user );
     242        wp_set_current_user( $old_current_user );
    243243    }
    244244
     
    249249        $u2 = self::factory()->user->create();
    250250        $u3 = self::factory()->user->create();
    251         self::set_current_user( $u1 );
     251        wp_set_current_user( $u1 );
    252252
    253253        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    281281        $this->assertEqualSets( array( $i1, $r1 ), $invites );
    282282
    283         self::set_current_user( $old_current_user );
     283        wp_set_current_user( $old_current_user );
    284284    }
    285285
     
    288288
    289289        $u1 = self::factory()->user->create();
    290         self::set_current_user( $u1 );
     290        wp_set_current_user( $u1 );
    291291
    292292        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    308308        $this->assertEqualSets( array( $r1, $r2 ), $requests );
    309309
    310         self::set_current_user( $old_current_user );
     310        wp_set_current_user( $old_current_user );
    311311    }
    312312
     
    317317
    318318        $u1 = self::factory()->user->create();
    319         self::set_current_user( $u1 );
     319        wp_set_current_user( $u1 );
    320320
    321321        // Create a couple of requests.
     
    328328        $this->assertFalse( $invites_class->add_request( $request_args ) );
    329329
    330         self::set_current_user( $old_current_user );
     330        wp_set_current_user( $old_current_user );
    331331    }
    332332
     
    336336        $u1 = self::factory()->user->create();
    337337        $u2 = self::factory()->user->create();
    338         self::set_current_user( $u1 );
     338        wp_set_current_user( $u1 );
    339339
    340340        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    366366        $this->assertEqualSets( array( $r1, $i1 ), $invites );
    367367
    368         self::set_current_user( $old_current_user );
     368        wp_set_current_user( $old_current_user );
    369369    }
    370370
     
    374374        $u1 = self::factory()->user->create();
    375375        $u2 = self::factory()->user->create();
    376         self::set_current_user( $u1 );
     376        wp_set_current_user( $u1 );
    377377
    378378        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    394394        $this->assertEquals( 1, $invite->invite_sent );
    395395
    396         self::set_current_user( $old_current_user );
     396        wp_set_current_user( $old_current_user );
    397397    }
    398398
     
    402402        $u1 = self::factory()->user->create();
    403403        $u2 = self::factory()->user->create();
    404         self::set_current_user( $u1 );
     404        wp_set_current_user( $u1 );
    405405
    406406        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    439439        $this->assertEqualSets( array( $i2 ), $invites );
    440440
    441         self::set_current_user( $old_current_user );
     441        wp_set_current_user( $old_current_user );
    442442    }
    443443
     
    446446
    447447        $u1 = self::factory()->user->create();
    448         self::set_current_user( $u1 );
     448        wp_set_current_user( $u1 );
    449449
    450450        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    461461        $this->assertEquals( $time, $req->date_modified );
    462462
    463         self::set_current_user( $old_current_user );
     463        wp_set_current_user( $old_current_user );
    464464    }
    465465
     
    469469        $u1 = self::factory()->user->create();
    470470        $u2 = self::factory()->user->create();
    471         self::set_current_user( $u1 );
     471        wp_set_current_user( $u1 );
    472472
    473473        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    487487        $this->assertEquals( $time, $inv->date_modified );
    488488
    489         self::set_current_user( $old_current_user );
     489        wp_set_current_user( $old_current_user );
    490490    }
    491491
     
    496496        $u2 = self::factory()->user->create();
    497497        $u3 = self::factory()->user->create();
    498         self::set_current_user( $u1 );
     498        wp_set_current_user( $u1 );
    499499
    500500        $invites_class = new BPTest_Invitation_Manager_Extension();
     
    537537        $this->assertEquals( array( $i3, $i1, $i2 ), $invites );
    538538
    539         self::set_current_user( $old_current_user );
     539        wp_set_current_user( $old_current_user );
    540540    }
    541541}
  • trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php

    r13980 r14070  
    4949    public function test_user_has_access_false_user_logged_out() {
    5050        $old_current_user = get_current_user_id();
    51         self::set_current_user( 0 );
     51        wp_set_current_user( 0 );
    5252
    5353        $subnav_item = array(
     
    6262        $this->assertSame( $expected, bp_core_maybe_hook_new_subnav_screen_function( $subnav_item ) );
    6363
    64         self::set_current_user( $old_current_user );
     64        wp_set_current_user( $old_current_user );
    6565    }
    6666
     
    6868        $u = self::factory()->user->create();
    6969        $old_current_user = get_current_user_id();
    70         self::set_current_user( $u );
     70        wp_set_current_user( $u );
    7171        $this->set_permalink_structure( '/%postname%/' );
    7272
     
    8282        $this->assertSame( bp_members_get_user_url( $u ), $found['redirect_args']['root'] );
    8383
    84         self::set_current_user( $old_current_user );
     84        wp_set_current_user( $old_current_user );
    8585    }
    8686
     
    8989        $u2 = self::factory()->user->create();
    9090        $old_current_user = get_current_user_id();
    91         self::set_current_user( $u1 );
     91        wp_set_current_user( $u1 );
    9292        $this->set_permalink_structure( '/%postname%/' );
    9393
     
    113113
    114114        // Clean up
    115         self::set_current_user( $old_current_user );
     115        wp_set_current_user( $old_current_user );
    116116        buddypress()->default_component = $old_default_component;
    117117        buddypress()->bp_nav = $old_bp_nav;
     
    125125        $u2 = self::factory()->user->create();
    126126        $old_current_user = get_current_user_id();
    127         self::set_current_user( $u1 );
     127        wp_set_current_user( $u1 );
    128128        $this->set_permalink_structure( '/%postname%/' );
    129129
     
    150150
    151151        // Clean up
    152         self::set_current_user( $old_current_user );
     152        wp_set_current_user( $old_current_user );
    153153        buddypress()->default_component = $old_default_component;
    154154        buddypress()->bp_nav = $old_bp_nav;
     
    170170        $g = self::factory()->group->create();
    171171        $old_current_user = get_current_user_id();
    172         self::set_current_user( $u );
     172        wp_set_current_user( $u );
    173173        $this->set_permalink_structure( '/%postname%/' );
    174174
     
    188188
    189189        // Clean up
    190         self::set_current_user( $old_current_user );
     190        wp_set_current_user( $old_current_user );
    191191    }
    192192
     
    195195        $g = self::factory()->group->create();
    196196        $old_current_user = get_current_user_id();
    197         self::set_current_user( $u );
     197        wp_set_current_user( $u );
    198198
    199199        $group = groups_get_group( $g );
     
    211211
    212212        // Clean up
    213         self::set_current_user( $old_current_user );
     213        wp_set_current_user( $old_current_user );
    214214    }
    215215}
  • trunk/tests/phpunit/testcases/core/nav/bpCoreNewSubnavItem.php

    r13980 r14070  
    5050    public function test_site_admin_only() {
    5151        $old_current_user = get_current_user_id();
    52         self::set_current_user( 0 );
     52        wp_set_current_user( 0 );
    5353
    5454        $this->assertFalse( bp_core_new_subnav_item( array(
     
    6161        ) ) );
    6262
    63         self::set_current_user( $old_current_user );
     63        wp_set_current_user( $old_current_user );
    6464    }
    6565
     
    110110        $u = self::factory()->user->create();
    111111        $old_current_user = get_current_user_id();
    112         self::set_current_user( $u );
     112        wp_set_current_user( $u );
    113113
    114114        $url = bp_members_get_user_url(
     
    128128        remove_action( 'bp_setup_nav', array( $this, 'new_nav_hook' ), 0 );
    129129
    130         self::set_current_user( $old_current_user );
     130        wp_set_current_user( $old_current_user );
    131131    }
    132132}
  • trunk/tests/phpunit/testcases/core/nav/bpGetNavMenuItems.php

    r13980 r14070  
    2525        $users = self::factory()->user->create_many( 2 );
    2626
    27         self::set_current_user( $users[0] );
     27        wp_set_current_user( $users[0] );
    2828        $this->set_permalink_structure( '/%postname%/' );
    2929
     
    5151        $user = self::factory()->user->create();
    5252
    53         self::set_current_user( 0 );
     53        wp_set_current_user( 0 );
    5454        $this->set_permalink_structure( '/%postname%/' );
    5555
  • trunk/tests/phpunit/testcases/core/optouts.php

    r13991 r14070  
    3838
    3939        $u1 = self::factory()->user->create();
    40         self::set_current_user( $u1 );
     40        wp_set_current_user( $u1 );
    4141
    4242        // Create a couple of optouts.
     
    5757        $this->assertEqualSets( array( $i1, $i2 ), $optouts );
    5858
    59         self::set_current_user( $old_current_user );
     59        wp_set_current_user( $old_current_user );
    6060    }
    6161
     
    6464
    6565        $u1 = self::factory()->user->create();
    66         self::set_current_user( $u1 );
     66        wp_set_current_user( $u1 );
    6767
    6868        // Create an optouts.
     
    7777        $this->assertEquals( $i1, $i2 );
    7878
    79         self::set_current_user( $old_current_user );
     79        wp_set_current_user( $old_current_user );
    8080    }
    8181
     
    8484
    8585        $u1 = self::factory()->user->create();
    86         self::set_current_user( $u1 );
     86        wp_set_current_user( $u1 );
    8787
    8888        $args = array(
     
    101101        $this->assertEmpty( $optouts );
    102102
    103         self::set_current_user( $old_current_user );
     103        wp_set_current_user( $old_current_user );
    104104    }
    105105
     
    108108
    109109        $u1 = self::factory()->user->create();
    110         self::set_current_user( $u1 );
     110        wp_set_current_user( $u1 );
    111111
    112112        // Create a couple of optouts.
     
    127127        $this->assertEqualSets( array( $i1 ), $optouts );
    128128
    129         self::set_current_user( $old_current_user );
     129        wp_set_current_user( $old_current_user );
    130130    }
    131131
     
    134134
    135135        $u1 = self::factory()->user->create();
    136         self::set_current_user( $u1 );
     136        wp_set_current_user( $u1 );
    137137
    138138        // Create a couple of optouts.
     
    153153        $this->assertEqualSets( array( $i1 ), $optouts );
    154154
    155         self::set_current_user( $old_current_user );
     155        wp_set_current_user( $old_current_user );
    156156    }
    157157
     
    160160
    161161        $u1 = self::factory()->user->create();
    162         self::set_current_user( $u1 );
     162        wp_set_current_user( $u1 );
    163163
    164164        // Create a couple of optouts.
     
    179179        $this->assertEqualSets( array( $i1 ), $optouts );
    180180
    181         self::set_current_user( $old_current_user );
     181        wp_set_current_user( $old_current_user );
    182182    }
    183183
     
    187187
    188188        $u1 = self::factory()->user->create();
    189         self::set_current_user( $u1 );
     189        wp_set_current_user( $u1 );
    190190
    191191        // Create an opt-out.
     
    208208        $this->assertEqualSets( array( $i1 ), $optouts );
    209209
    210         self::set_current_user( $old_current_user );
     210        wp_set_current_user( $old_current_user );
    211211    }
    212212
     
    215215
    216216        $u1 = self::factory()->user->create();
    217         self::set_current_user( $u1 );
     217        wp_set_current_user( $u1 );
    218218        // Create an opt-out.
    219219        $args = array(
     
    228228
    229229        $this->assertTrue( is_wp_error( $email->validate() ) );
    230         self::set_current_user( $old_current_user );
     230        wp_set_current_user( $old_current_user );
    231231    }
    232232}
  • trunk/tests/phpunit/testcases/core/suggestions.php

    r13980 r14070  
    112112    public function set_up() {
    113113        parent::set_up();
    114         self::set_current_user( self::$current_user );
     114        wp_set_current_user( self::$current_user );
    115115    }
    116116
    117117    public function tear_down() {
    118         self::set_current_user( self::$old_user_id );
     118        wp_set_current_user( self::$old_user_id );
    119119        parent::tear_down();
    120120    }
     
    269269
    270270        // "alpaca red" is in the hidden group
    271         self::set_current_user( self::$user_ids['alpaca red'] );
     271        wp_set_current_user( self::$user_ids['alpaca red'] );
    272272        $suggestions = bp_core_get_suggestions( array(
    273273            'group_id' => self::$group_ids['hidden'],
     
    289289
    290290        // "caterpillar" is in the private group
    291         self::set_current_user( self::$user_ids['caterpillar'] );
     291        wp_set_current_user( self::$user_ids['caterpillar'] );
    292292        $suggestions = bp_core_get_suggestions( array(
    293293            'group_id' => self::$group_ids['private'],
     
    328328
    329329
    330         self::set_current_user( self::$user_ids['caterpillar'] );
     330        wp_set_current_user( self::$user_ids['caterpillar'] );
    331331
    332332        // "cat" is in the private group, so won't show up here.
     
    359359
    360360
    361         self::set_current_user( self::$user_ids['alpaca red'] );
     361        wp_set_current_user( self::$user_ids['alpaca red'] );
    362362
    363363        // "alpaca red" is in the hidden group, so won't show up here.
  • trunk/tests/phpunit/testcases/core/template/bpUserHasAccess.php

    r13980 r14070  
    2222
    2323        $this->grant_bp_moderate( $users[0] );
    24         self::set_current_user( $users[0] );
     24        wp_set_current_user( $users[0] );
    2525        $this->set_permalink_structure( '/%postname%/' );
    2626
     
    3333        $users = self::factory()->user->create_many( 2 );
    3434
    35         self::set_current_user( $users[0] );
     35        wp_set_current_user( $users[0] );
    3636        $this->set_permalink_structure( '/%postname%/' );
    3737
     
    4444        $users = self::factory()->user->create_many( 2 );
    4545
    46         self::set_current_user( $users[0] );
     46        wp_set_current_user( $users[0] );
    4747        $this->set_permalink_structure( '/%postname%/' );
    4848
  • trunk/tests/phpunit/testcases/core/test-components-controller.php

    r14026 r14070  
    2121     */
    2222    public function test_get_items() {
    23         $this->bp::set_current_user( $this->user );
     23        wp_set_current_user( $this->user );
    2424
    2525        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    4242     */
    4343    public function test_get_items_paginated() {
    44         $this->bp::set_current_user( $this->user );
     44        wp_set_current_user( $this->user );
    4545
    4646        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    6767     */
    6868    public function test_get_items_invalid_status() {
    69         $this->bp::set_current_user( $this->user );
     69        wp_set_current_user( $this->user );
    7070
    7171        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    9898        $u = static::factory()->user->create();
    9999
    100         $this->bp::set_current_user( $u );
     100        wp_set_current_user( $u );
    101101
    102102        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    117117        );
    118118
    119         $this->bp::set_current_user( $u );
     119        wp_set_current_user( $u );
    120120
    121121        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    136136     */
    137137    public function test_get_items_active_component_features() {
    138         $this->bp::set_current_user( $this->user );
     138        wp_set_current_user( $this->user );
    139139
    140140        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    157157     */
    158158    public function test_get_items_inactive_component_features() {
    159         $this->bp::set_current_user( $this->user );
     159        wp_set_current_user( $this->user );
    160160
    161161        add_filter( 'bp_is_messages_star_active', '__return_false' );
     
    190190     */
    191191    public function test_get_items_inactive_component() {
    192         $this->bp::set_current_user( $this->user );
     192        wp_set_current_user( $this->user );
    193193
    194194        add_filter( 'bp_is_active', array( $this, 'deactivate_activity_component' ), 10, 2 );
     
    237237     */
    238238    public function test_update_item() {
    239         $this->bp::set_current_user( $this->user );
     239        wp_set_current_user( $this->user );
    240240
    241241        $request = new WP_REST_Request( 'PUT', $this->endpoint_url );
     
    260260     */
    261261    public function test_update_item_nonexistent_component() {
    262         $this->bp::set_current_user( $this->user );
     262        wp_set_current_user( $this->user );
    263263
    264264        $request = new WP_REST_Request( 'PUT', $this->endpoint_url );
     
    278278     */
    279279    public function test_update_item_empty_action() {
    280         $this->bp::set_current_user( $this->user );
     280        wp_set_current_user( $this->user );
    281281
    282282        $request = new WP_REST_Request( 'PUT', $this->endpoint_url );
     
    296296     */
    297297    public function test_update_item_invalid_action() {
    298         $this->bp::set_current_user( $this->user );
     298        wp_set_current_user( $this->user );
    299299
    300300        $request = new WP_REST_Request( 'PUT', $this->endpoint_url );
     
    332332        $u = static::factory()->user->create();
    333333
    334         $this->bp::set_current_user( $u );
     334        wp_set_current_user( $u );
    335335
    336336        $request = new WP_REST_Request( 'PUT', $this->endpoint_url );
  • trunk/tests/phpunit/testcases/friends/activity.php

    r13980 r14070  
    6363
    6464        // Set current user to u1 to accepte the friendship
    65         self::set_current_user( $u1 );
    66         friends_accept_friendship( $friendship_id );
    67 
    68         // Reset the current user
    69         self::set_current_user( $old_user );
     65        wp_set_current_user( $u1 );
     66        friends_accept_friendship( $friendship_id );
     67
     68        // Reset the current user
     69        wp_set_current_user( $old_user );
    7070
    7171        // Random activities
     
    110110
    111111        // Set current user to u1 to accept the friendship
    112         self::set_current_user( $u1 );
    113         friends_accept_friendship( $friendship_id );
    114 
    115         // Reset the current user
    116         self::set_current_user( $old_user );
     112        wp_set_current_user( $u1 );
     113        friends_accept_friendship( $friendship_id );
     114
     115        // Reset the current user
     116        wp_set_current_user( $old_user );
    117117
    118118        $u1_act = bp_activity_get( array(
     
    149149
    150150        // Set current user to u1 to accepte the friendship and generate a public activity
    151         self::set_current_user( $u1 );
    152         friends_accept_friendship( $friendship_id );
    153 
    154         // Reset the current user
    155         self::set_current_user( $old_user );
     151        wp_set_current_user( $u1 );
     152        friends_accept_friendship( $friendship_id );
     153
     154        // Reset the current user
     155        wp_set_current_user( $old_user );
    156156
    157157        $users[] = self::factory()->user->create();
     
    199199
    200200        // Set current user to u1 to accept the friendship
    201         self::set_current_user( $u1 );
    202         friends_accept_friendship( $friendship_id );
    203 
    204         // Reset the current user
    205         self::set_current_user( $old_user );
     201        wp_set_current_user( $u1 );
     202        friends_accept_friendship( $friendship_id );
     203
     204        // Reset the current user
     205        wp_set_current_user( $old_user );
    206206
    207207        // Delete $u1.
     
    223223        $old_user = get_current_user_id();
    224224        $u1 = self::factory()->user->create();
    225         self::set_current_user( $u1 );
     225        wp_set_current_user( $u1 );
    226226
    227227        bp_activity_remove_all_user_data( $u1 );
     
    229229        wp_delete_user( $u1 );
    230230
    231         self::set_current_user( $old_user );
     231        wp_set_current_user( $old_user );
    232232
    233233        // Remove the following lines when you implement this test.
  • trunk/tests/phpunit/testcases/friends/functions.php

    r13980 r14070  
    6767        // accept friendship
    6868        $old_user = get_current_user_id();
    69         self::set_current_user( $u1 );
     69        wp_set_current_user( $u1 );
    7070        friends_accept_friendship( friends_get_friendship_id( $u2, $u1 ) );
    7171
     
    7474        $this->assertEquals( array( $u3 ), $requests );
    7575
    76         self::set_current_user( $old_user );
     76        wp_set_current_user( $old_user );
    7777    }
    7878
     
    124124        // user 2 withdraws friendship
    125125        $old_user = get_current_user_id();
    126         self::set_current_user( $u2 );
     126        wp_set_current_user( $u2 );
    127127        friends_withdraw_friendship( $u2, $u1 );
    128128
     
    131131        $this->assertEquals( array(), $requests );
    132132
    133         self::set_current_user( $old_user );
     133        wp_set_current_user( $old_user );
    134134    }
    135135
     
    152152        // user 1 rejects friendship
    153153        $old_user = get_current_user_id();
    154         self::set_current_user( $u1 );
     154        wp_set_current_user( $u1 );
    155155        friends_reject_friendship( friends_get_friendship_id( $u2, $u1 ) );
    156156
     
    159159        $this->assertEquals( array(), $requests );
    160160
    161         self::set_current_user( $old_user );
     161        wp_set_current_user( $old_user );
    162162    }
    163163
     
    198198
    199199        $old_user = get_current_user_id();
    200         self::set_current_user( $u1 );
     200        wp_set_current_user( $u1 );
    201201
    202202        $found = array();
     
    217217        // clean up
    218218        $GLOBALS['members_template'] = null;
    219         self::set_current_user( $old_user );
     219        wp_set_current_user( $old_user );
    220220    }
    221221
     
    300300         * @see bp_friends_filter_user_query_populate_extras()
    301301         */
    302         self::set_current_user( $u1 );
     302        wp_set_current_user( $u1 );
    303303        $this->go_to( bp_get_members_directory_permalink() );
    304304        ob_start();
     
    315315         * properly.
    316316         */
    317         self::set_current_user( $u2 );
     317        wp_set_current_user( $u2 );
    318318        friends_accept_friendship( friends_get_friendship_id( $u1, $u2 ) );
    319319
    320320        // Afterwards, user 1 decides to cancel friendship.
    321         self::set_current_user( $u1 );
     321        wp_set_current_user( $u1 );
    322322        friends_remove_friend( $u1, $u2 );
    323323
     
    325325        $this->assertEquals( 'not_friends', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
    326326
    327         self::set_current_user( $old_user );
     327        wp_set_current_user( $old_user );
    328328    }
    329329
  • trunk/tests/phpunit/testcases/friends/notifications.php

    r13980 r14070  
    1212        parent::set_up();
    1313        $this->current_user = get_current_user_id();
    14         self::set_current_user( self::factory()->user->create() );
     14        wp_set_current_user( self::factory()->user->create() );
    1515
    1616        $this->friend = self::factory()->user->create();
     
    1919
    2020    public function tear_down() {
    21         self::set_current_user( $this->current_user );
     21        wp_set_current_user( $this->current_user );
    2222        parent::tear_down();
    2323    }
  • trunk/tests/phpunit/testcases/friends/test-controller.php

    r14026 r14070  
    3939        $this->create_friendship();
    4040
    41         $this->bp::set_current_user( $this->user );
     41        wp_set_current_user( $this->user );
    4242
    4343        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    7676     */
    7777    public function test_get_item() {
    78         $this->bp::set_current_user( $this->user );
     78        wp_set_current_user( $this->user );
    7979
    8080        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $this->friend ) );
     
    9797     */
    9898    public function test_get_item_with_invalid_friend_id() {
    99         $this->bp::set_current_user( $this->user );
     99        wp_set_current_user( $this->user );
    100100
    101101        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    121121     */
    122122    public function test_create_item() {
    123         $this->bp::set_current_user( $this->user );
     123        wp_set_current_user( $this->user );
    124124
    125125        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    145145        $u2 = static::factory()->user->create();
    146146
    147         $this->bp::set_current_user( $u2 );
     147        wp_set_current_user( $u2 );
    148148
    149149        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    167167        $u = static::factory()->user->create();
    168168
    169         $this->bp::set_current_user( $this->user );
     169        wp_set_current_user( $this->user );
    170170
    171171        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    190190
    191191        $this->create_friendship( $user );
    192         $this->bp::set_current_user( $this->user );
     192        wp_set_current_user( $this->user );
    193193
    194194        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    224224     */
    225225    public function test_regular_user_can_not_create_friendship_to_others() {
    226         $this->bp::set_current_user( static::factory()->user->create() );
     226        wp_set_current_user( static::factory()->user->create() );
    227227
    228228        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    240240     */
    241241    public function test_admins_can_create_friendship_to_others() {
    242         $this->bp::set_current_user( $this->user );
     242        wp_set_current_user( $this->user );
    243243
    244244        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    260260     */
    261261    public function test_admins_can_force_friendship_creation() {
    262         $this->bp::set_current_user( $this->user );
     262        wp_set_current_user( $this->user );
    263263
    264264        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    282282    public function test_regular_users_can_not_force_friendship_creation() {
    283283        $u = static::factory()->user->create();
    284         $this->bp::set_current_user( $u );
     284        wp_set_current_user( $u );
    285285
    286286        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    335335        $this->create_friendship();
    336336
    337         $this->bp::set_current_user( $this->friend );
     337        wp_set_current_user( $this->friend );
    338338
    339339        $request  = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->user ) );
     
    353353        $this->create_friendship();
    354354
    355         $this->bp::set_current_user( $this->user );
     355        wp_set_current_user( $this->user );
    356356
    357357        $request  = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->friend ) );
     
    365365     */
    366366    public function test_update_item_invalid_friend_id() {
    367         $this->bp::set_current_user( $this->user );
     367        wp_set_current_user( $this->user );
    368368
    369369        $request  = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    389389        $this->create_friendship();
    390390
    391         $this->bp::set_current_user( $this->friend );
     391        wp_set_current_user( $this->friend );
    392392
    393393        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->user ) );
     
    407407        $this->create_friendship();
    408408
    409         $this->bp::set_current_user( $this->user );
     409        wp_set_current_user( $this->user );
    410410
    411411        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->friend ) );
     
    425425        $this->create_friendship();
    426426
    427         $this->bp::set_current_user( $this->friend );
     427        wp_set_current_user( $this->friend );
    428428
    429429        $request = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->user ) );
     
    444444        $this->create_friendship();
    445445
    446         $this->bp::set_current_user( $this->user );
     446        wp_set_current_user( $this->user );
    447447
    448448        $request = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->friend ) );
     
    463463        $this->create_friendship();
    464464
    465         $this->bp::set_current_user( $this->user );
     465        wp_set_current_user( $this->user );
    466466
    467467        $request = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->friend ) );
     
    482482        $this->create_friendship();
    483483
    484         $this->bp::set_current_user( $this->friend );
     484        wp_set_current_user( $this->friend );
    485485
    486486        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->user ) );
     
    500500        $this->create_friendship();
    501501
    502         $this->bp::set_current_user( $this->friend );
     502        wp_set_current_user( $this->friend );
    503503
    504504        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    522522     */
    523523    public function test_prepare_item() {
    524         $this->bp::set_current_user( $this->user );
     524        wp_set_current_user( $this->user );
    525525
    526526        $request  = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $this->friend ) );
  • trunk/tests/phpunit/testcases/groups/activity.php

    r14026 r14070  
    117117        $old_user = get_current_user_id();
    118118        $u        = self::factory()->user->create();
    119         self::set_current_user( $u );
     119        wp_set_current_user( $u );
    120120
    121121        $group = self::factory()->group->create_and_get();
     
    143143        $this->assertSame( $expected, $a['activities'][0]->action );
    144144
    145         self::set_current_user( $old_user );
     145        wp_set_current_user( $old_user );
    146146    }
    147147
     
    153153        $old_user = get_current_user_id();
    154154        $u        = self::factory()->user->create();
    155         self::set_current_user( $u );
     155        wp_set_current_user( $u );
    156156
    157157        $group = self::factory()->group->create_and_get();
     
    179179        $this->assertSame( $expected, $a['activities'][0]->action );
    180180
    181         self::set_current_user( $old_user );
     181        wp_set_current_user( $old_user );
    182182    }
    183183
     
    189189        $old_user = get_current_user_id();
    190190        $u        = self::factory()->user->create();
    191         self::set_current_user( $u );
     191        wp_set_current_user( $u );
    192192
    193193        $group = self::factory()->group->create_and_get();
     
    216216        $this->assertSame( $expected, $a['activities'][0]->action );
    217217
    218         self::set_current_user( $old_user );
     218        wp_set_current_user( $old_user );
    219219    }
    220220
     
    226226        $old_user = get_current_user_id();
    227227        $u        = self::factory()->user->create();
    228         self::set_current_user( $u );
     228        wp_set_current_user( $u );
    229229
    230230        $group = self::factory()->group->create_and_get();
     
    252252        $this->assertSame( $expected, $a['activities'][0]->action );
    253253
    254         self::set_current_user( $old_user );
     254        wp_set_current_user( $old_user );
    255255    }
    256256
     
    357357        );
    358358
    359         self::set_current_user( $u1 );
     359        wp_set_current_user( $u1 );
    360360        if ( bp_has_activities( array( 'in' => $a ) ) ) {
    361361            while ( bp_activities() ) :
     
    366366        }
    367367
    368         self::set_current_user( $u2 );
     368        wp_set_current_user( $u2 );
    369369        if ( bp_has_activities( array( 'in' => $a ) ) ) {
    370370            while ( bp_activities() ) :
     
    375375        }
    376376
    377         self::set_current_user( $old_user );
     377        wp_set_current_user( $old_user );
    378378    }
    379379
     
    400400        $original_user = bp_loggedin_user_id();
    401401
    402         self::set_current_user( $u1 );
     402        wp_set_current_user( $u1 );
    403403
    404404        $g = self::factory()->group->create();
     
    432432
    433433        // User can delete his own activity.
    434         self::set_current_user( $u2 );
     434        wp_set_current_user( $u2 );
    435435        $this->assertTrue( bp_activity_user_can_delete( $activity ) );
    436436
    437437        // Activity from site admins can't be deleted by non site admins.
    438         self::set_current_user( $u2 );
     438        wp_set_current_user( $u2 );
    439439        $this->assertFalse( bp_activity_user_can_delete( $activity_b ) );
    440440
    441441        // Activity from site admins can be deleted by other site admins.
    442442        $site_admin = self::factory()->user->create( array( 'role' => 'administrator' ) );
    443         self::set_current_user( $site_admin );
     443        wp_set_current_user( $site_admin );
    444444        $this->assertTrue( bp_activity_user_can_delete( $activity_b ) );
    445445
    446446        // Group creator can delete activity.
    447         self::set_current_user( $u1 );
     447        wp_set_current_user( $u1 );
    448448        $this->assertTrue( bp_activity_user_can_delete( $activity ) );
    449449
    450450        // Logged-out user can't delete activity.
    451         self::set_current_user( 0 );
     451        wp_set_current_user( 0 );
    452452        $this->assertFalse( bp_activity_user_can_delete( $activity ) );
    453453
    454454        // Misc user can't delete activity.
    455455        $misc_user = self::factory()->user->create();
    456         self::set_current_user( $misc_user );
     456        wp_set_current_user( $misc_user );
    457457        $this->assertFalse( bp_activity_user_can_delete( $activity ) );
    458458
     
    460460        $misc_user_2 = self::factory()->user->create();
    461461        self::add_user_to_group( $misc_user_2, $g );
    462         self::set_current_user( $misc_user_2 );
     462        wp_set_current_user( $misc_user_2 );
    463463        $this->assertFalse( bp_activity_user_can_delete( $activity ) );
    464464
     
    466466        $misc_user_3 = self::factory()->user->create();
    467467        self::add_user_to_group( $misc_user_3, $g, array( 'is_mod' => true ) );
    468         self::set_current_user( $misc_user_3 );
     468        wp_set_current_user( $misc_user_3 );
    469469        $this->assertTrue( bp_activity_user_can_delete( $activity ) );
    470470
     
    472472        $misc_user_4 = self::factory()->user->create();
    473473        self::add_user_to_group( $misc_user_4, $g, array( 'is_admin' => true ) );
    474         self::set_current_user( $misc_user_4 );
     474        wp_set_current_user( $misc_user_4 );
    475475        $this->assertTrue( bp_activity_user_can_delete( $activity ) );
    476476
    477         self::set_current_user( $original_user );
     477        wp_set_current_user( $original_user );
    478478    }
    479479
     
    486486        $original_user = bp_loggedin_user_id();
    487487
    488         self::set_current_user( $u1 );
     488        wp_set_current_user( $u1 );
    489489
    490490        $g  = self::factory()->group->create();
     
    523523        self::add_user_to_group( $u2, $g, array( 'is_admin' => true ) );
    524524
    525         self::set_current_user( $u2 );
     525        wp_set_current_user( $u2 );
    526526        $this->assertFalse( bp_activity_user_can_delete( $activity ), 'Group Admins or Mods shouldn not be able to delete activities that are not attached to a group' );
    527527
     
    537537        $this->assertFalse( bp_activity_user_can_delete( $activity ), 'Group Admins or Mods should not be able to delete another group activities.' );
    538538
    539         self::set_current_user( $original_user );
     539        wp_set_current_user( $original_user );
    540540    }
    541541}
  • trunk/tests/phpunit/testcases/groups/class-bp-group-extension.php

    r13980 r14070  
    241241        $this->go_to( bp_get_group_url( $g_obj ) );
    242242
    243         self::set_current_user( 0 );
     243        wp_set_current_user( 0 );
    244244
    245245        $e = new BPTest_Group_Extension_Inferred_Access_Settings_EnableNavItem_True();
     
    251251        $this->assertFalse( $e2->user_can_visit() );
    252252
    253         self::set_current_user( $old_current_user );
     253        wp_set_current_user( $old_current_user );
    254254    }
    255255
     
    260260        $this->set_permalink_structure( '/%postname%/' );
    261261        $old_current_user = get_current_user_id();
    262         self::set_current_user( 0 );
     262        wp_set_current_user( 0 );
    263263
    264264        $g = self::factory()->group->create( array(
     
    292292        $this->assertFalse( $e6->user_can_visit() );
    293293
    294         self::set_current_user( $old_current_user );
     294        wp_set_current_user( $old_current_user );
    295295    }
    296296
     
    307307        $u = self::factory()->user->create();
    308308        $old_current_user = get_current_user_id();
    309         self::set_current_user( $u );
     309        wp_set_current_user( $u );
    310310
    311311        $this->go_to( bp_get_group_url( $g_obj ) );
     
    335335        $this->assertFalse( $e6->user_can_visit() );
    336336
    337         self::set_current_user( $old_current_user );
     337        wp_set_current_user( $old_current_user );
    338338    }
    339339
     
    350350        $u = self::factory()->user->create();
    351351        $old_current_user = get_current_user_id();
    352         self::set_current_user( $u );
     352        wp_set_current_user( $u );
    353353
    354354        $this->add_user_to_group( $u, $g );
     
    380380        $this->assertFalse( $e6->user_can_visit() );
    381381
    382         self::set_current_user( $old_current_user );
     382        wp_set_current_user( $old_current_user );
    383383    }
    384384
     
    395395        $u = self::factory()->user->create();
    396396        $old_current_user = get_current_user_id();
    397         self::set_current_user( $u );
     397        wp_set_current_user( $u );
    398398
    399399        $m = $this->add_user_to_group( $u, $g );
     
    427427        $this->assertFalse( $e6->user_can_visit() );
    428428
    429         self::set_current_user( $old_current_user );
     429        wp_set_current_user( $old_current_user );
    430430    }
    431431
     
    442442        $u = self::factory()->user->create();
    443443        $old_current_user = get_current_user_id();
    444         self::set_current_user( $u );
     444        wp_set_current_user( $u );
    445445
    446446        $m = $this->add_user_to_group( $u, $g );
     
    474474        $this->assertFalse( $e6->user_can_visit() );
    475475
    476         self::set_current_user( $old_current_user );
     476        wp_set_current_user( $old_current_user );
    477477    }
    478478
     
    488488
    489489        $old_current_user = get_current_user_id();
    490         self::set_current_user( 0 );
     490        wp_set_current_user( 0 );
    491491
    492492        $this->go_to( bp_get_group_url( $g_obj ) );
     
    516516        $this->assertFalse( $e6->user_can_visit() );
    517517
    518         self::set_current_user( $old_current_user );
     518        wp_set_current_user( $old_current_user );
    519519    }
    520520
     
    530530
    531531        $old_current_user = get_current_user_id();
    532         self::set_current_user( 0 );
     532        wp_set_current_user( 0 );
    533533
    534534        $this->go_to( bp_get_group_url( $g_obj ) );
     
    558558        $this->assertFalse( $e6->user_can_see_nav_item() );
    559559
    560         self::set_current_user( $old_current_user );
     560        wp_set_current_user( $old_current_user );
    561561    }
    562562
     
    573573        $u = self::factory()->user->create();
    574574        $old_current_user = get_current_user_id();
    575         self::set_current_user( $u );
     575        wp_set_current_user( $u );
    576576
    577577        $this->go_to( bp_get_group_url( $g_obj ) );
     
    601601        $this->assertFalse( $e6->user_can_see_nav_item() );
    602602
    603         self::set_current_user( $old_current_user );
     603        wp_set_current_user( $old_current_user );
    604604    }
    605605
     
    616616        $u = self::factory()->user->create();
    617617        $old_current_user = get_current_user_id();
    618         self::set_current_user( $u );
     618        wp_set_current_user( $u );
    619619
    620620        $this->add_user_to_group( $u, $g );
     
    646646        $this->assertFalse( $e6->user_can_see_nav_item() );
    647647
    648         self::set_current_user( $old_current_user );
     648        wp_set_current_user( $old_current_user );
    649649    }
    650650
     
    661661        $u = self::factory()->user->create();
    662662        $old_current_user = get_current_user_id();
    663         self::set_current_user( $u );
     663        wp_set_current_user( $u );
    664664
    665665        $this->add_user_to_group( $u, $g );
     
    693693        $this->assertFalse( $e6->user_can_see_nav_item() );
    694694
    695         self::set_current_user( $old_current_user );
     695        wp_set_current_user( $old_current_user );
    696696    }
    697697
     
    708708        $u = self::factory()->user->create();
    709709        $old_current_user = get_current_user_id();
    710         self::set_current_user( $u );
     710        wp_set_current_user( $u );
    711711
    712712        $this->add_user_to_group( $u, $g );
     
    740740        $this->assertFalse( $e6->user_can_see_nav_item() );
    741741
    742         self::set_current_user( $old_current_user );
     742        wp_set_current_user( $old_current_user );
    743743    }
    744744
  • trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php

    r13980 r14070  
    976976
    977977        // Instantiate group object.
    978         self::set_current_user( $u );
     978        wp_set_current_user( $u );
    979979        $group = new BP_Groups_Group( $g );
    980980
     
    982982        $this->assertTrue( ! empty( $group->is_member ) );
    983983
    984         self::set_current_user( $this->old_current_user );
     984        wp_set_current_user( $this->old_current_user );
    985985    }
    986986
     
    14701470
    14711471        $old_user = get_current_user_id();
    1472         self::set_current_user( 0 );
     1472        wp_set_current_user( 0 );
    14731473
    14741474        $this->assertEquals( $expected, BP_Groups_Group::get_group_extras( $paged_groups, $group_ids ) );
    14751475
    1476         self::set_current_user( $old_user );
     1476        wp_set_current_user( $old_user );
    14771477    }
    14781478
     
    15011501
    15021502        $old_user = get_current_user_id();
    1503         self::set_current_user( $u );
     1503        wp_set_current_user( $u );
    15041504
    15051505        $this->assertEquals( $expected, BP_Groups_Group::get_group_extras( $paged_groups, $group_ids ) );
    15061506
    1507         self::set_current_user( $old_user );
     1507        wp_set_current_user( $old_user );
    15081508    }
    15091509
     
    15331533
    15341534        $old_user = get_current_user_id();
    1535         self::set_current_user( $u );
     1535        wp_set_current_user( $u );
    15361536
    15371537        $this->assertEquals( $expected, BP_Groups_Group::get_group_extras( $paged_groups, $group_ids ) );
    15381538
    1539         self::set_current_user( $old_user );
     1539        wp_set_current_user( $old_user );
    15401540    }
    15411541
     
    15731573
    15741574        $old_user = get_current_user_id();
    1575         self::set_current_user( $u );
     1575        wp_set_current_user( $u );
    15761576
    15771577        $this->assertEquals( $expected, BP_Groups_Group::get_group_extras( $paged_groups, $group_ids ) );
    15781578
    1579         self::set_current_user( $old_user );
     1579        wp_set_current_user( $old_user );
    15801580    }
    15811581
     
    16101610
    16111611        $old_user = get_current_user_id();
    1612         self::set_current_user( $u );
     1612        wp_set_current_user( $u );
    16131613
    16141614        $this->assertEquals( $expected, BP_Groups_Group::get_group_extras( $paged_groups, $group_ids ) );
    16151615
    1616         self::set_current_user( $old_user );
     1616        wp_set_current_user( $old_user );
    16171617    }
    16181618
     
    16481648
    16491649        $old_user = get_current_user_id();
    1650         self::set_current_user( $u );
     1650        wp_set_current_user( $u );
    16511651
    16521652        $this->assertEquals( $expected, BP_Groups_Group::get_group_extras( $paged_groups, $group_ids ) );
    16531653
    1654         self::set_current_user( $old_user );
     1654        wp_set_current_user( $old_user );
    16551655    }
    16561656
     
    17451745    /**
    17461746     * @ticket BP5451
     1747     * @ticket BP7658
    17471748     */
    17481749    public function test_is_member_property() {
    1749         $users = self::factory()->user->create_many( 2 );
    1750 
    1751         $g = self::factory()->group->create( array(
    1752             'creator_id' => $users[0],
    1753         ) );
    1754 
    1755         wp_set_current_user( $users[1] );
     1750        $u1 = self::factory()->user->create();
     1751        $u2 = self::factory()->user->create();
     1752        $g  = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     1753
     1754        wp_set_current_user( $u2 );
    17561755
    17571756        $group_a = new BP_Groups_Group( $g );
     1757
     1758        // $u2 IS NOT a member of $g yet.
    17581759        $this->assertFalse( $group_a->is_member );
    17591760
    1760         $this->add_user_to_group( $users[1], $g );
     1761        // Now $u2 IS a member of $g.
     1762        $this->add_user_to_group( $u2, $g );
     1763
    17611764        $group_b = new BP_Groups_Group( $g );
    1762         $this->assertFalse( $group_b->is_member );
     1765
     1766        // $u2 IS a member of $g. This returns the ID of the membership, not the User id or boolean.
     1767        $this->assertTrue( (bool) $group_b->is_member );
    17631768    }
    17641769
    17651770    /**
    17661771     * @ticket BP5451
     1772     * @ticket BP7658
    17671773     */
    17681774    public function test_is_invited_property() {
    1769         $users = self::factory()->user->create_many( 2 );
    1770 
    1771         $g = self::factory()->group->create( array(
    1772             'creator_id' => $users[0],
    1773         ) );
    1774 
    1775         wp_set_current_user( $users[1] );
     1775        $u1 = self::factory()->user->create();
     1776        $u2 = self::factory()->user->create();
     1777        $g  = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     1778
     1779        wp_set_current_user( $u2 );
    17761780
    17771781        $group_a = new BP_Groups_Group( $g );
     1782
    17781783        $this->assertFalse( $group_a->is_invited );
    17791784
    17801785        groups_invite_user( array(
    1781             'user_id'    => $users[1],
     1786            'user_id'    => $u2,
    17821787            'group_id'   => $g,
    1783             'inviter_id' => $users[0],
     1788            'inviter_id' => $u1,
    17841789            'send_invite' => 1
    17851790        ) );
    17861791
    17871792        $group_b = new BP_Groups_Group( $g );
    1788         $this->assertFalse( $group_b->is_invited );
     1793
     1794        $this->assertTrue( wp_validate_boolean( $group_b->is_invited ) );
    17891795    }
    17901796
     
    17931799     */
    17941800    public function test_is_pending_property() {
    1795         $users = self::factory()->user->create_many( 2 );
    1796 
    1797         $g = self::factory()->group->create( array(
    1798             'creator_id' => $users[0],
    1799         ) );
    1800 
    1801         wp_set_current_user( $users[1] );
     1801        $u1 = self::factory()->user->create();
     1802        $u2 = self::factory()->user->create();
     1803        $g  = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     1804
     1805        wp_set_current_user( $u2 );
    18021806
    18031807        $group_a = new BP_Groups_Group( $g );
     1808
    18041809        $this->assertFalse( $group_a->is_pending );
    18051810
    18061811        groups_send_membership_request( array(
    1807             'user_id' => $users[1],
     1812            'user_id' => $u2,
    18081813            'group_id' => $g
    18091814        ) );
     
    18121817        $this->assertFalse( $group_b->is_pending );
    18131818    }
    1814 
    18151819
    18161820    /**
  • trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

    r13980 r14070  
    222222        $this->assertTrue( bp_groups_user_can_send_invites( $g, $u_siteadmin ) );
    223223        // Falling back to current user
    224         self::set_current_user( $u_members );
     224        wp_set_current_user( $u_members );
    225225        $this->assertTrue( bp_groups_user_can_send_invites( $g, null ) );
    226226
     
    233233        $this->assertTrue( bp_groups_user_can_send_invites( $g, $u_siteadmin ) );
    234234        // Falling back to current user
    235         self::set_current_user( $u_members );
     235        wp_set_current_user( $u_members );
    236236        $this->assertFalse( bp_groups_user_can_send_invites( $g, null ) );
    237         self::set_current_user( $u_mods );
     237        wp_set_current_user( $u_mods );
    238238        $this->assertTrue( bp_groups_user_can_send_invites( $g, null ) );
    239239
     
    246246        $this->assertTrue( bp_groups_user_can_send_invites( $g, $u_siteadmin ) );
    247247        // Falling back to current user
    248         self::set_current_user( $u_mods );
     248        wp_set_current_user( $u_mods );
    249249        $this->assertFalse( bp_groups_user_can_send_invites( $g, null ) );
    250         self::set_current_user( $u_admins );
     250        wp_set_current_user( $u_admins );
    251251        $this->assertTrue( bp_groups_user_can_send_invites( $g, null ) );
    252252
     
    264264        $this->assertTrue( bp_groups_user_can_send_invites( null, $u_mods ) );
    265265
    266         self::set_current_user( $old_current_user );
     266        wp_set_current_user( $old_current_user );
    267267    }
    268268
     
    680680        $g = self::factory()->group->create();
    681681        $old_current_user = get_current_user_id();
    682         self::set_current_user( $u1 );
     682        wp_set_current_user( $u1 );
    683683
    684684        groups_join_group( $g );
    685685        $membership_id = groups_is_user_member( $u1, $g );
    686686        $this->assertTrue( is_numeric( $membership_id ) && $membership_id > 0 );
    687         self::set_current_user( $old_current_user );
     687        wp_set_current_user( $old_current_user );
    688688    }
    689689
     
    754754
    755755        $before = groups_get_total_member_count( $g );
    756         self::set_current_user( $u2 );
     756        wp_set_current_user( $u2 );
    757757        groups_leave_group( $g, $u2 );
    758758        $after = groups_get_total_member_count( $g );
    759759
    760760        $this->assertEquals( $before - 1, $after );
    761         self::set_current_user( $old_current_user );
     761        wp_set_current_user( $old_current_user );
    762762    }
    763763
     
    774774
    775775        $before = groups_get_total_member_count( $g );
    776         self::set_current_user( $u2 );
     776        wp_set_current_user( $u2 );
    777777        groups_leave_group( $g );
    778778        $after = groups_get_total_member_count( $g );
    779779
    780780        $this->assertEquals( $before - 1, $after );
    781         self::set_current_user( $old_current_user );
     781        wp_set_current_user( $old_current_user );
    782782    }
    783783
     
    794794
    795795        $before = groups_get_total_member_count( $g );
    796         self::set_current_user( $u1 );
     796        wp_set_current_user( $u1 );
    797797        groups_leave_group( $g, $u2 );
    798798        $after = groups_get_total_member_count( $g );
    799799
    800800        $this->assertEquals( $before - 1, $after );
    801         self::set_current_user( $old_current_user );
     801        wp_set_current_user( $old_current_user );
    802802    }
    803803
     
    816816
    817817        $before = groups_get_total_member_count( $g );
    818         self::set_current_user( $u1 );
     818        wp_set_current_user( $u1 );
    819819        groups_leave_group( $g, $u2 );
    820820        $after = groups_get_total_member_count( $g );
    821821
    822822        $this->assertEquals( $before - 1, $after );
    823         self::set_current_user( $old_current_user );
     823        wp_set_current_user( $old_current_user );
    824824    }
    825825
     
    836836
    837837        $before = groups_get_total_member_count( $g );
    838         self::set_current_user( $u1 );
     838        wp_set_current_user( $u1 );
    839839        groups_leave_group( $g, $u1 );
    840840        $after = groups_get_total_member_count( $g );
    841841
    842842        $this->assertEquals( $before, $after );
    843         self::set_current_user( $old_current_user );
     843        wp_set_current_user( $old_current_user );
    844844    }
    845845
     
    858858
    859859        $before = groups_get_total_member_count( $g );
    860         self::set_current_user( $u1 );
     860        wp_set_current_user( $u1 );
    861861        groups_leave_group( $g, $u1 );
    862862        $after = groups_get_total_member_count( $g );
    863863
    864864        $this->assertEquals( $before - 1, $after );
    865         self::set_current_user( $old_current_user );
     865        wp_set_current_user( $old_current_user );
    866866    }
    867867
     
    935935        ) );
    936936
    937         self::set_current_user( $u2 );
     937        wp_set_current_user( $u2 );
    938938        $groups = groups_get_invites_for_user();
    939939        $this->assertEqualSets( array( $g1, $g2, $g3 ), wp_list_pluck( $groups['groups'], 'id' ) );
    940940
    941         self::set_current_user( $old_current_user );
     941        wp_set_current_user( $old_current_user );
    942942    }
    943943
  • trunk/tests/phpunit/testcases/groups/functions.php

    r13980 r14070  
    6161
    6262        // Set the current user so the leave group request goes through.
    63         self::set_current_user( $u2 );
     63        wp_set_current_user( $u2 );
    6464        groups_leave_group( $g1, $u2 );
    6565        $this->assertEquals( 1, bp_get_user_meta( $u2, 'total_group_count', true ) );
     
    7979
    8080        // Fool the admin check
    81         self::set_current_user( $u1 );
     81        wp_set_current_user( $u1 );
    8282        buddypress()->is_item_admin = true;
    8383
     
    100100
    101101        // Fool the admin check
    102         self::set_current_user( $u1 );
     102        wp_set_current_user( $u1 );
    103103        buddypress()->is_item_admin = true;
    104104
     
    140140
    141141        $current_user = bp_loggedin_user_id();
    142         self::set_current_user( $u2 );
     142        wp_set_current_user( $u2 );
    143143
    144144        $g = self::factory()->group->create( array( 'status' => 'private' ) );
     
    152152        $this->assertEquals( 1, bp_get_user_meta( $u1, 'total_group_count', true ) );
    153153
    154         self::set_current_user( $current_user );
     154        wp_set_current_user( $current_user );
    155155    }
    156156
     
    168168
    169169        // Fool the admin check
    170         self::set_current_user( $u1 );
     170        wp_set_current_user( $u1 );
    171171        buddypress()->is_item_admin = true;
    172172
     
    227227
    228228        // Fool the admin check
    229         self::set_current_user( $u1 );
     229        wp_set_current_user( $u1 );
    230230        buddypress()->is_item_admin = true;
    231231
     
    248248
    249249        // Fool the admin check
    250         self::set_current_user( $u1 );
     250        wp_set_current_user( $u1 );
    251251        buddypress()->is_item_admin = true;
    252252
     
    311311
    312312        // Fool the admin check
    313         self::set_current_user( $u1 );
     313        wp_set_current_user( $u1 );
    314314        buddypress()->is_item_admin = true;
    315315
     
    382382        ) );
    383383
    384         self::set_current_user( $u1 );
     384        wp_set_current_user( $u1 );
    385385        $g1 = self::factory()->group->create();
    386386
     
    389389        $this->assertEquals( 2, groups_get_total_member_count( $g1 ) );
    390390
    391         self::set_current_user( $current_user );
     391        wp_set_current_user( $current_user );
    392392    }
    393393
  • trunk/tests/phpunit/testcases/groups/functions/groupsCreateGroup.php

    r13980 r14070  
    2222    public function test_should_respect_creator_id() {
    2323        $old_user_id = bp_loggedin_user_id();
    24         self::set_current_user( self::$user_id );
     24        wp_set_current_user( self::$user_id );
    2525
    2626        $group_id = groups_create_group( array(
     
    3131        $group = groups_get_group( $group_id );
    3232
    33         self::set_current_user( $old_user_id );
     33        wp_set_current_user( $old_user_id );
    3434
    3535        $this->assertSame( self::$user_id + 1, $group->creator_id );
     
    4141    public function test_creator_id_should_be_fall_back_to_loggedin_user_for_new_group() {
    4242        $old_user_id = bp_loggedin_user_id();
    43         self::set_current_user( self::$user_id );
     43        wp_set_current_user( self::$user_id );
    4444
    4545        $group_id = groups_create_group( array(
     
    4949        $group = groups_get_group( $group_id );
    5050
    51         self::set_current_user( $old_user_id );
     51        wp_set_current_user( $old_user_id );
    5252
    5353        $this->assertSame( self::$user_id, $group->creator_id );
     
    6363
    6464        $old_user_id = bp_loggedin_user_id();
    65         self::set_current_user( self::$user_id );
     65        wp_set_current_user( self::$user_id );
    6666
    6767        $group_id = groups_create_group( array(
     
    7171        $group = groups_get_group( $group_id );
    7272
    73         self::set_current_user( $old_user_id );
     73        wp_set_current_user( $old_user_id );
    7474
    7575        $this->assertSame( self::$user_id + 1, $group->creator_id );
  • trunk/tests/phpunit/testcases/groups/notifications.php

    r13980 r14070  
    1414        parent::set_up();
    1515        $this->current_user = get_current_user_id();
    16         self::set_current_user( self::factory()->user->create() );
     16        wp_set_current_user( self::factory()->user->create() );
    1717
    1818        $this->requesting_user_id = self::factory()->user->create();
     
    2222
    2323    public function tear_down() {
    24         self::set_current_user( $this->current_user );
     24        wp_set_current_user( $this->current_user );
    2525
    2626        parent::tear_down();
  • trunk/tests/phpunit/testcases/groups/template.php

    r13980 r14070  
    903903        // Fool the admin check
    904904        $old_user = get_current_user_id();
    905         self::set_current_user( $u2 );
     905        wp_set_current_user( $u2 );
    906906        buddypress()->is_item_admin = true;
    907907        groups_ban_member( $u1, $g2 );
    908908
    909909        // Start the groups loop
    910         self::set_current_user( $u1 );
     910        wp_set_current_user( $u1 );
    911911        if ( bp_has_groups() ) : while ( bp_groups() ) : bp_the_group();
    912912            $found[] = bp_group_is_user_banned();
     
    919919        // Clean up
    920920        $GLOBALS['groups_template'] = null;
    921         self::set_current_user( $old_user );
     921        wp_set_current_user( $old_user );
    922922    }
    923923
     
    949949        // Fool the admin check
    950950        $old_user = get_current_user_id();
    951         self::set_current_user( $u2 );
     951        wp_set_current_user( $u2 );
    952952        buddypress()->is_item_admin = true;
    953953        groups_ban_member( $u1, $g2 );
     
    966966
    967967        // Clean up
    968         self::set_current_user( $old_user );
     968        wp_set_current_user( $old_user );
    969969    }
    970970
  • trunk/tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php

    r13980 r14070  
    1212        parent::set_up();
    1313        $this->current_user = bp_loggedin_user_id();
    14         self::set_current_user( 0 );
     14        wp_set_current_user( 0 );
    1515
    1616        if ( isset( $GLOBALS['groups_template'] ) ) {
     
    2020
    2121    public function tear_down() {
    22         self::set_current_user( $this->current_user );
     22        wp_set_current_user( $this->current_user );
    2323        if ( $this->groups_template ) {
    2424            $GLOBALS['groups_template'] = $this->groups_template;
     
    3535        $g = self::factory()->group->create( array( 'status' => 'private' ) );
    3636
    37         self::set_current_user( $users[0] );
     37        wp_set_current_user( $users[0] );
    3838
    3939        groups_invite_user( array(
     
    6161        $g = self::factory()->group->create( array( 'status' => 'private' ) );
    6262
    63         self::set_current_user( $u );
     63        wp_set_current_user( $u );
    6464
    6565        if ( bp_has_groups( array( 'include' => array( $g ) ) ) ) {
     
    9898        $g = self::factory()->group->create( array( 'status' => 'private' ) );
    9999
    100         self::set_current_user( $u );
     100        wp_set_current_user( $u );
    101101
    102102        groups_send_membership_request( array(
     
    123123        $g = self::factory()->group->create( array( 'status' => 'hidden' ) );
    124124
    125         self::set_current_user( $u );
     125        wp_set_current_user( $u );
    126126
    127127        $group = groups_get_group( $g );
     
    140140        $groups = self::factory()->group->create_many( 2, array( 'status' => 'private' ) );
    141141
    142         self::set_current_user( $u );
     142        wp_set_current_user( $u );
    143143
    144144        // Fake the current group.
  • trunk/tests/phpunit/testcases/groups/template/group-is-visible.php

    r13980 r14070  
    3434        $u = self::factory()->user->create();
    3535
    36         self::set_current_user( $u );
     36        wp_set_current_user( $u );
    3737
    3838        $this->assertFalse( bp_group_is_visible( $g ) );
     
    4343        $u = self::factory()->user->create();
    4444
    45         self::set_current_user( $u );
     45        wp_set_current_user( $u );
    4646
    4747        $this->add_user_to_group( $u, $g );
     
    5757        $GLOBALS['groups_template']->group = null;
    5858
    59         self::set_current_user( $u );
     59        wp_set_current_user( $u );
    6060
    6161        $this->assertFalse( bp_group_is_visible() );
     
    6666        $u = self::factory()->user->create( array( 'role' => 'administrator' ) );
    6767
    68         self::set_current_user( $u );
     68        wp_set_current_user( $u );
    6969
    7070        $this->assertTrue( bp_group_is_visible( $g ) );
     
    9999        $u = self::factory()->user->create( array( 'role' => 'administrator' ) );
    100100
    101         self::set_current_user( $u );
     101        wp_set_current_user( $u );
    102102
    103103        $this->assertTrue( bp_group_is_visible( $slug ) );
     
    112112        $GLOBALS['groups_template']->group = groups_get_group( $g );
    113113
    114         self::set_current_user( $u );
     114        wp_set_current_user( $u );
    115115
    116116        $this->assertTrue( bp_group_is_visible() );
  • trunk/tests/phpunit/testcases/groups/test-controller.php

    r14026 r14070  
    3838     */
    3939    public function test_get_items() {
    40         $this->bp::set_current_user( $this->user );
     40        wp_set_current_user( $this->user );
    4141
    4242        $this->bp::factory()->group->create_many( 3 );
     
    8181        $this->bp::add_user_to_group( $u, $g2 );
    8282
    83         $this->bp::set_current_user( $u );
     83        wp_set_current_user( $u );
    8484
    8585        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    124124        $this->bp::add_user_to_group( $u, $g2 );
    125125
    126         $this->bp::set_current_user( $u );
     126        wp_set_current_user( $u );
    127127
    128128        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    160160
    161161        $this->bp::add_user_to_group( $u, $g );
    162         $this->bp::set_current_user( $u );
     162        wp_set_current_user( $u );
    163163
    164164        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    201201        $this->bp::add_user_to_group( $u, $g6 );
    202202
    203         $this->bp::set_current_user( $u );
     203        wp_set_current_user( $u );
    204204
    205205        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    271271     */
    272272    public function test_get_items_edit_context_users_private_data() {
    273         $this->bp::set_current_user( $this->user );
     273        wp_set_current_user( $this->user );
    274274
    275275        $this->bp::factory()->group->create();
     
    302302        $u2 = $this->bp::factory()->user->create();
    303303
    304         $this->bp::set_current_user( $u1 );
     304        wp_set_current_user( $u1 );
    305305
    306306        $now = time();
     
    347347     */
    348348    public function test_get_items_with_group_types() {
    349         $this->bp::set_current_user( $this->user );
     349        wp_set_current_user( $this->user );
    350350
    351351        bp_groups_register_group_type( 'foo' );
     
    383383    public function test_get_item() {
    384384        $u = static::factory()->user->create();
    385         $this->bp::set_current_user( $u );
     385        wp_set_current_user( $u );
    386386
    387387        $group = $this->endpoint->get_group_object( $this->group_id );
     
    434434     */
    435435    public function test_get_item_invalid_group_id() {
    436         $this->bp::set_current_user( $this->user );
     436        wp_set_current_user( $this->user );
    437437
    438438        $request  = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    456456
    457457        $this->bp::add_user_to_group( $u, $group->id );
    458         $this->bp::set_current_user( $u );
     458        wp_set_current_user( $u );
    459459
    460460        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $group->id ) );
     
    482482        $group = $this->endpoint->get_group_object( $g );
    483483
    484         $this->bp::set_current_user( $u );
     484        wp_set_current_user( $u );
    485485
    486486        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $group->id ) );
     
    497497    public function test_get_item_with_avatar() {
    498498        $u = static::factory()->user->create();
    499         $this->bp::set_current_user( $u );
     499        wp_set_current_user( $u );
    500500
    501501        $group = $this->endpoint->get_group_object( $this->group_id );
     
    517517    public function test_get_item_without_avatar() {
    518518        $u = static::factory()->user->create();
    519         $this->bp::set_current_user( $u );
     519        wp_set_current_user( $u );
    520520
    521521        $group = $this->endpoint->get_group_object( $this->group_id );
     
    539539    public function test_get_item_extra() {
    540540        $u = static::factory()->user->create();
    541         $this->bp::set_current_user( $u );
     541        wp_set_current_user( $u );
    542542
    543543        $group = $this->endpoint->get_group_object( $this->group_id );
     
    561561     */
    562562    public function test_render_item() {
    563         $this->bp::set_current_user( $this->user );
     563        wp_set_current_user( $this->user );
    564564
    565565        $g = $this->bp::factory()->group->create(
     
    583583     */
    584584    public function test_create_item() {
    585         $this->bp::set_current_user( $this->user );
     585        wp_set_current_user( $this->user );
    586586
    587587        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    600600     */
    601601    public function test_rest_create_item() {
    602         $this->bp::set_current_user( $this->user );
     602        wp_set_current_user( $this->user );
    603603
    604604        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    619619        bp_groups_register_group_type( 'foo' );
    620620
    621         $this->bp::set_current_user( $this->user );
     621        wp_set_current_user( $this->user );
    622622
    623623        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    636636     */
    637637    public function test_create_item_with_no_name() {
    638         $this->bp::set_current_user( $this->user );
     638        wp_set_current_user( $this->user );
    639639
    640640        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    686686        $this->assertEquals( $this->group_id, $group->id );
    687687
    688         $this->bp::set_current_user( $this->user );
     688        wp_set_current_user( $this->user );
    689689
    690690        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $group->id ) );
     
    714714        bp_groups_set_group_type( $this->group_id, 'bar' );
    715715
    716         $this->bp::set_current_user( $this->user );
     716        wp_set_current_user( $this->user );
    717717
    718718        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    735735        bp_groups_set_group_type( $this->group_id, 'bar' );
    736736
    737         $this->bp::set_current_user( $this->user );
     737        wp_set_current_user( $this->user );
    738738
    739739        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    757757        bp_groups_set_group_type( $this->group_id, 'bar' );
    758758
    759         $this->bp::set_current_user( $this->user );
     759        wp_set_current_user( $this->user );
    760760
    761761        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    774774     */
    775775    public function test_update_item_invalid_id() {
    776         $this->bp::set_current_user( $this->user );
     776        wp_set_current_user( $this->user );
    777777
    778778        $request  = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    804804
    805805        $u2 = static::factory()->user->create();
    806         $this->bp::set_current_user( $u2 );
     806        wp_set_current_user( $u2 );
    807807
    808808        $group = $this->endpoint->get_group_object( $a );
     
    823823     */
    824824    public function test_site_admins_can_update_item() {
    825         $this->bp::set_current_user( $this->user );
     825        wp_set_current_user( $this->user );
    826826
    827827        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    851851        $this->bp::add_user_to_group( $u, $this->group_id, array( 'is_admin' => true ) );
    852852
    853         $this->bp::set_current_user( $u );
     853        wp_set_current_user( $u );
    854854
    855855        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    879879        $this->bp::add_user_to_group( $u, $this->group_id, array( 'is_mod' => true ) );
    880880
    881         $this->bp::set_current_user( $u );
     881        wp_set_current_user( $u );
    882882
    883883        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    897897    public function test_update_item_invalid_status() {
    898898        $group = $this->endpoint->get_group_object( $this->group_id );
    899         $this->bp::set_current_user( $this->user );
     899        wp_set_current_user( $this->user );
    900900
    901901        $request = new WP_REST_Request( 'PUT', sprintf( $this->endpoint_url . '/%d', $group->id ) );
     
    914914     */
    915915    public function test_delete_item() {
    916         $this->bp::set_current_user( $this->user );
     916        wp_set_current_user( $this->user );
    917917
    918918        $request = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    930930     */
    931931    public function test_delete_item_invalid_id() {
    932         $this->bp::set_current_user( $this->user );
     932        wp_set_current_user( $this->user );
    933933
    934934        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    952952     */
    953953    public function test_delete_item_without_permission() {
    954         $this->bp::set_current_user( static::factory()->user->create() );
     954        wp_set_current_user( static::factory()->user->create() );
    955955
    956956        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    969969        $this->bp::add_user_to_group( $u, $this->group_id, array( 'is_mod' => true ) );
    970970
    971         $this->bp::set_current_user( $u );
     971        wp_set_current_user( $u );
    972972
    973973        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    981981     */
    982982    public function test_site_admins_can_delete_group() {
    983         $this->bp::set_current_user( $this->user );
     983        wp_set_current_user( $this->user );
    984984
    985985        $request = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    10021002        $this->bp::add_user_to_group( $u, $this->group_id, array( 'is_admin' => true ) );
    10031003
    1004         $this->bp::set_current_user( $u );
     1004        wp_set_current_user( $u );
    10051005
    10061006        $request = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d', $this->group_id ) );
     
    10191019    public function test_get_current_user_groups() {
    10201020        $u = static::factory()->user->create();
    1021         $this->bp::set_current_user( $u );
     1021        wp_set_current_user( $u );
    10221022
    10231023        $groups = array();
     
    10461046    public function test_get_current_user_groups_max_one() {
    10471047        $u = static::factory()->user->create();
    1048         $this->bp::set_current_user( $u );
     1048        wp_set_current_user( $u );
    10491049
    10501050        $groups = array();
     
    10841084
    10851085    public function test_prepare_item() {
    1086         $this->bp::set_current_user( $this->user );
     1086        wp_set_current_user( $this->user );
    10871087
    10881088        $group = $this->endpoint->get_group_object( $this->group_id );
     
    12611261        );
    12621262
    1263         $this->bp::set_current_user( $this->user );
     1263        wp_set_current_user( $this->user );
    12641264        $expected = 'bar_value';
    12651265
     
    13071307        );
    13081308
    1309         $this->bp::set_current_user( $this->user );
     1309        wp_set_current_user( $this->user );
    13101310
    13111311        $expected = 'foo_value';
  • trunk/tests/phpunit/testcases/groups/test-group-avatar-controller.php

    r14026 r14070  
    4747     */
    4848    public function test_get_item() {
    49         $this->bp::set_current_user( $this->user );
     49        wp_set_current_user( $this->user );
    5050
    5151        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d/avatar', $this->group_id ) );
     
    108108        $reset_post  = $_POST;
    109109
    110         $this->bp::set_current_user( $this->user );
     110        wp_set_current_user( $this->user );
    111111
    112112        add_filter( 'pre_move_uploaded_file', array( $this, 'copy_file' ), 10, 3 );
     
    178178        $reset_post  = $_POST;
    179179
    180         $this->bp::set_current_user( $this->user );
     180        wp_set_current_user( $this->user );
    181181
    182182        // Disabling group avatar upload.
     
    208208     */
    209209    public function test_create_item_empty_image() {
    210         $this->bp::set_current_user( $this->user );
     210        wp_set_current_user( $this->user );
    211211
    212212        $request  = new WP_REST_Request( 'POST', sprintf( $this->endpoint_url . '/%d/avatar', $this->group_id ) );
     
    230230        $u1 = $this->bp::factory()->user->create();
    231231
    232         $this->bp::set_current_user( $u1 );
     232        wp_set_current_user( $u1 );
    233233
    234234        $request  = new WP_REST_Request( 'POST', sprintf( $this->endpoint_url . '/%d/avatar', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    255255     */
    256256    public function test_delete_item_failed() {
    257         $this->bp::set_current_user( $this->user );
     257        wp_set_current_user( $this->user );
    258258
    259259        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d/avatar', $this->group_id ) );
     
    276276     */
    277277    public function test_delete_item_invalid_group() {
    278         $this->bp::set_current_user( $this->user );
     278        wp_set_current_user( $this->user );
    279279
    280280        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d/avatar', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
  • trunk/tests/phpunit/testcases/groups/test-group-cover-controller.php

    r14026 r14070  
    9696        }
    9797
    98         $this->bp::set_current_user( $this->user );
     98        wp_set_current_user( $this->user );
    9999        $reset_files = $_FILES;
    100100
     
    124124        }
    125125
    126         $this->bp::set_current_user( $this->user );
     126        wp_set_current_user( $this->user );
    127127        $reset_files = $_FILES;
    128128
     
    151151     */
    152152    public function test_create_item_empty_image() {
    153         $this->bp::set_current_user( $this->user );
     153        wp_set_current_user( $this->user );
    154154
    155155        $request  = new WP_REST_Request( 'POST', sprintf( $this->endpoint_url . '/%d/cover', $this->group_id ) );
     
    173173        $u1 = $this->bp::factory()->user->create();
    174174
    175         $this->bp::set_current_user( $u1 );
     175        wp_set_current_user( $u1 );
    176176
    177177        $request  = new WP_REST_Request( 'POST', sprintf( $this->endpoint_url . '/%d/cover', $this->group_id ) );
     
    184184     */
    185185    public function test_create_item_invalid_group_id() {
    186         $this->bp::set_current_user( $this->user );
     186        wp_set_current_user( $this->user );
    187187
    188188        $request  = new WP_REST_Request( 'POST', sprintf( $this->endpoint_url . '/%d/cover', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    220220        $u1 = $this->bp::factory()->user->create();
    221221
    222         $this->bp::set_current_user( $u1 );
     222        wp_set_current_user( $u1 );
    223223
    224224        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d/cover', $this->group_id ) );
     
    231231     */
    232232    public function test_delete_item_invalid_group_id() {
    233         $this->bp::set_current_user( $this->user );
     233        wp_set_current_user( $this->user );
    234234
    235235        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d/cover', REST_TESTS_IMPOSSIBLY_HIGH_NUMBER ) );
     
    242242     */
    243243    public function test_delete_item_failed() {
    244         $this->bp::set_current_user( $this->user );
     244        wp_set_current_user( $this->user );
    245245
    246246        $request  = new WP_REST_Request( 'DELETE', sprintf( $this->endpoint_url . '/%d/cover', $this->group_id ) );
  • trunk/tests/phpunit/testcases/groups/test-group-invites-controller.php

    r14026 r14070  
    6969
    7070        // As site admin
    71         $this->bp::set_current_user( $this->user );
     71        wp_set_current_user( $this->user );
    7272        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
    7373        $request->set_query_params(
     
    128128        $this->populate_group_with_invites( array( $u4 ), $this->group_id );
    129129
    130         $this->bp::set_current_user( $this->g1admin );
     130        wp_set_current_user( $this->g1admin );
    131131        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
    132132        $request->set_query_params(
     
    181181        );
    182182
    183         $this->bp::set_current_user( $u1 );
     183        wp_set_current_user( $u1 );
    184184        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
    185185        $request->set_query_params(
     
    238238        );
    239239
    240         $this->bp::set_current_user( $u4 );
     240        wp_set_current_user( $u4 );
    241241        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
    242242        $request->set_query_params(
     
    262262     */
    263263    public function test_get_items_user_not_logged_in() {
    264         $this->bp::set_current_user( 0 );
     264        wp_set_current_user( 0 );
    265265
    266266        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    281281    public function test_get_items_without_permission() {
    282282        $u1 = static::factory()->user->create();
    283         $this->bp::set_current_user( $u1 );
     283        wp_set_current_user( $u1 );
    284284
    285285        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    310310        );
    311311
    312         $this->bp::set_current_user( $this->user );
     312        wp_set_current_user( $this->user );
    313313        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $invite_id ) );
    314314        $request->set_param( 'context', 'view' );
     
    359359        );
    360360
    361         $this->bp::set_current_user( $u1 );
     361        wp_set_current_user( $u1 );
    362362        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $invite_id ) );
    363363        $request->set_param( 'context', 'view' );
     
    384384        );
    385385
    386         $this->bp::set_current_user( $this->g1admin );
     386        wp_set_current_user( $this->g1admin );
    387387        $request = new WP_REST_Request( 'GET', sprintf( $this->endpoint_url . '/%d', $invite_id ) );
    388388        $request->set_param( 'context', 'view' );
     
    400400        $u1 = static::factory()->user->create();
    401401
    402         $this->bp::set_current_user( $this->user );
     402        wp_set_current_user( $this->user );
    403403
    404404        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    428428        $u1 = static::factory()->user->create();
    429429
    430         $this->bp::set_current_user( $this->g1admin );
     430        wp_set_current_user( $this->g1admin );
    431431
    432432        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    455455    public function test_inviter_cannot_invite_member_to_group_if_already_member() {
    456456        // $this->user is a creator of the group.
    457         $this->bp::set_current_user( $this->user );
     457        wp_set_current_user( $this->user );
    458458
    459459        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    477477        $u = static::factory()->user->create();
    478478
    479         $this->bp::set_current_user( 0 );
     479        wp_set_current_user( 0 );
    480480        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
    481481        $request->set_param( 'context', 'edit' );
     
    496496     */
    497497    public function test_create_item_invalid_member_id() {
    498         $this->bp::set_current_user( $this->user );
     498        wp_set_current_user( $this->user );
    499499
    500500        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    518518        $u = static::factory()->user->create();
    519519
    520         $this->bp::set_current_user( $this->user );
     520        wp_set_current_user( $this->user );
    521521
    522522        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    539539        $u = static::factory()->user->create();
    540540
    541         $this->bp::set_current_user( $this->user );
     541        wp_set_current_user( $this->user );
    542542
    543543        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    562562        $u2 = static::factory()->user->create();
    563563
    564         $this->bp::set_current_user( $u2 );
     564        wp_set_current_user( $u2 );
    565565
    566566        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    592592        );
    593593
    594         $this->bp::set_current_user( $this->user );
     594        wp_set_current_user( $this->user );
    595595
    596596        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $invite_id );
     
    619619        );
    620620
    621         $this->bp::set_current_user( $u1 );
     621        wp_set_current_user( $u1 );
    622622
    623623        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $invite_id );
     
    636636     */
    637637    public function test_update_item_invalid_id() {
    638         $this->bp::set_current_user( $this->user );
     638        wp_set_current_user( $this->user );
    639639
    640640        $request  = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
     
    658658            )
    659659        );
    660         $this->bp::set_current_user( 0 );
     660        wp_set_current_user( 0 );
    661661        $request  = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $invite_id );
    662662        $response = $this->server->dispatch( $request );
     
    681681        );
    682682
    683         $this->bp::set_current_user( $u2 );
     683        wp_set_current_user( $u2 );
    684684
    685685        $request  = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $invite_id );
     
    704704
    705705        // Delete as site admin.
    706         $this->bp::set_current_user( $this->user );
     706        wp_set_current_user( $this->user );
    707707
    708708        $request  = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $invite_id );
     
    731731        );
    732732
    733         $this->bp::set_current_user( $u1 );
     733        wp_set_current_user( $u1 );
    734734
    735735        $request  = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $invite_id );
     
    752752        $this->bp::add_user_to_group( $u2, $this->g1 );
    753753
    754         $this->bp::set_current_user( $u2 );
     754        wp_set_current_user( $u2 );
    755755
    756756        $invite_id = groups_invite_user(
     
    782782        $this->bp::add_user_to_group( $u2, $this->g1 );
    783783
    784         $this->bp::set_current_user( $u2 );
     784        wp_set_current_user( $u2 );
    785785
    786786        $invite_id = groups_invite_user(
     
    793793        );
    794794
    795         $this->bp::set_current_user( $this->g1admin );
     795        wp_set_current_user( $this->g1admin );
    796796
    797797        $request  = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $invite_id );
     
    818818            )
    819819        );
    820         $this->bp::set_current_user( 0 );
     820        wp_set_current_user( 0 );
    821821        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $invite_id );
    822822        $request->set_query_params(
     
    846846            )
    847847        );
    848         $this->bp::set_current_user( $u2 );
     848        wp_set_current_user( $u2 );
    849849
    850850        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $invite_id );
     
    864864     */
    865865    public function test_delete_item_invalid_id() {
    866         $this->bp::set_current_user( $this->user );
     866        wp_set_current_user( $this->user );
    867867
    868868        $request  = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
  • trunk/tests/phpunit/testcases/groups/test-group-membership-controller.php

    r14026 r14070  
    5555        $this->populate_group_with_members( array( $u1, $u2 ), $g1 );
    5656
    57         $this->bp::set_current_user( $u1 );
     57        wp_set_current_user( $u1 );
    5858
    5959        $request  = new WP_REST_Request( 'GET', $this->endpoint_url . '/' . $g1 . '/members' );
     
    8484        $u2 = static::factory()->user->create();
    8585
    86         $this->bp::set_current_user( $u1 );
     86        wp_set_current_user( $u1 );
    8787
    8888        $g1 = $this->bp::factory()->group->create(
     
    164164        $this->populate_group_with_members( array( $u1, $u2, $u3, $u4, $u5, $u6 ), $g1 );
    165165
    166         $this->bp::set_current_user( $u1 );
     166        wp_set_current_user( $u1 );
    167167
    168168        $request = new WP_REST_Request( 'GET', $this->endpoint_url . '/' . $g1 . '/members' );
     
    207207        $member_object->promote( 'admin' );
    208208
    209         $this->bp::set_current_user( $u1 );
     209        wp_set_current_user( $u1 );
    210210
    211211        add_filter( 'bp_rest_group_members_get_items_query_args', array( $this, 'group_members_query_args' ) );
     
    243243        $member_object->promote( 'admin' );
    244244
    245         $this->bp::set_current_user( $u1 );
     245        wp_set_current_user( $u1 );
    246246
    247247        add_filter( 'bp_rest_group_members_get_items_query_args', array( $this, 'group_members_query_args' ) );
     
    285285        $g = $this->bp::factory()->group->create();
    286286
    287         $this->bp::set_current_user( $u );
     287        wp_set_current_user( $u );
    288288
    289289        $request = new WP_REST_Request( 'POST', $this->endpoint_url . '/' . $g . '/members' );
     
    305305        $u = static::factory()->user->create( array( 'role' => 'administrator' ) );
    306306
    307         $this->bp::set_current_user( $this->user );
     307        wp_set_current_user( $this->user );
    308308
    309309        $request = new WP_REST_Request( 'POST', $this->endpoint_url . '/' . $this->group_id . '/members' );
     
    333333        $u = static::factory()->user->create();
    334334
    335         $this->bp::set_current_user( $u );
     335        wp_set_current_user( $u );
    336336
    337337        $request = new WP_REST_Request( 'POST', $this->endpoint_url . '/' . $this->group_id . '/members' );
     
    365365        );
    366366
    367         $this->bp::set_current_user( $u );
     367        wp_set_current_user( $u );
    368368
    369369        $request = new WP_REST_Request( 'POST', $this->endpoint_url . '/' . $g1 . '/members' );
     
    387387        );
    388388
    389         $this->bp::set_current_user( $u );
     389        wp_set_current_user( $u );
    390390
    391391        $request = new WP_REST_Request( 'POST', $this->endpoint_url . '/' . $g1 . '/members' );
     
    408408        $u2 = static::factory()->user->create();
    409409
    410         $this->bp::set_current_user( $u1 );
     410        wp_set_current_user( $u1 );
    411411
    412412        $request = new WP_REST_Request( 'POST', $this->endpoint_url . '/' . $this->group_id . '/members' );
     
    433433        $this->populate_group_with_members( array( $u ), $this->group_id );
    434434
    435         $this->bp::set_current_user( $this->user );
     435        wp_set_current_user( $this->user );
    436436
    437437        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $this->group_id . '/members/' . $u );
     
    468468        $member_object->promote( 'mod' );
    469469
    470         $this->bp::set_current_user( $u1 );
     470        wp_set_current_user( $u1 );
    471471
    472472        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u3 );
     
    496496        $member_object->promote( 'mod' );
    497497
    498         $this->bp::set_current_user( $u1 );
     498        wp_set_current_user( $u1 );
    499499
    500500        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u4 );
     
    523523        $member_object->promote( 'admin' );
    524524
    525         $this->bp::set_current_user( $u2 );
     525        wp_set_current_user( $u2 );
    526526
    527527        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    555555        $this->populate_group_with_members( array( $u1, $u3 ), $g1 );
    556556
    557         $this->bp::set_current_user( $u2 );
     557        wp_set_current_user( $u2 );
    558558
    559559        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u4 );
     
    583583        $this->assertTrue( (bool) $member_object->is_banned );
    584584
    585         $this->bp::set_current_user( $this->user );
     585        wp_set_current_user( $this->user );
    586586
    587587        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    614614        $this->populate_group_with_members( array( $u1, $u3 ), $g1 );
    615615
    616         $this->bp::set_current_user( $this->user );
     616        wp_set_current_user( $this->user );
    617617
    618618        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u4 );
     
    655655        $this->assertTrue( (bool) $member_object->is_banned );
    656656
    657         $this->bp::set_current_user( $u2 );
     657        wp_set_current_user( $u2 );
    658658
    659659        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    695695        $this->assertTrue( (bool) $member_object->is_banned );
    696696
    697         $this->bp::set_current_user( $u2 );
     697        wp_set_current_user( $u2 );
    698698
    699699        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    714714        $this->populate_group_with_members( array( $u ), $this->group_id );
    715715
    716         $this->bp::set_current_user( $this->user );
     716        wp_set_current_user( $this->user );
    717717
    718718        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $this->group_id . '/members/' . $u );
     
    749749        $this->populate_group_with_members( array( $u1 ), $g1 );
    750750
    751         $this->bp::set_current_user( $u2 );
     751        wp_set_current_user( $u2 );
    752752
    753753        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    785785        $this->populate_group_with_members( array( $u1, $u3 ), $g1 );
    786786
    787         $this->bp::set_current_user( $u3 );
     787        wp_set_current_user( $u3 );
    788788
    789789        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    813813        $this->bp::add_user_to_group( $u2, $g1, array( 'is_mod' => true ) );
    814814
    815         $this->bp::set_current_user( $u2 );
     815        wp_set_current_user( $u2 );
    816816
    817817        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    839839        $this->bp::add_user_to_group( $u1, $g1, array( 'is_mod' => true ) );
    840840
    841         $this->bp::set_current_user( $u1 );
     841        wp_set_current_user( $u1 );
    842842
    843843        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    874874
    875875        // Site admin.
    876         $this->bp::set_current_user( $this->user );
     876        wp_set_current_user( $this->user );
    877877
    878878        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    908908
    909909        // Site admin.
    910         $this->bp::set_current_user( $this->user );
     910        wp_set_current_user( $this->user );
    911911
    912912        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    932932
    933933        // Site admin.
    934         $this->bp::set_current_user( $this->user );
     934        wp_set_current_user( $this->user );
    935935
    936936        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $this->user );
     
    966966
    967967        // Site admin.
    968         $this->bp::set_current_user( $this->user );
     968        wp_set_current_user( $this->user );
    969969
    970970        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    10061006
    10071007        // Site admin.
    1008         $this->bp::set_current_user( $this->user );
     1008        wp_set_current_user( $this->user );
    10091009
    10101010        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    10461046
    10471047        // Site admin.
    1048         $this->bp::set_current_user( $this->user );
     1048        wp_set_current_user( $this->user );
    10491049
    10501050        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    10721072        $group_member->promote( 'admin' );
    10731073
    1074         $this->bp::set_current_user( $u3 );
     1074        wp_set_current_user( $u3 );
    10751075
    10761076        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    11091109        $this->populate_group_with_members( array( $u1, $u3 ), $g1 );
    11101110
    1111         $this->bp::set_current_user( $u2 );
     1111        wp_set_current_user( $u2 );
    11121112
    11131113        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    11321132        $this->populate_group_with_members( array( $u1, $u3 ), $g1 );
    11331133
    1134         $this->bp::set_current_user( $u2 );
     1134        wp_set_current_user( $u2 );
    11351135
    11361136        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    11551155        $this->populate_group_with_members( array( $u1, $u3 ), $g1 );
    11561156
    1157         $this->bp::set_current_user( $u3 );
     1157        wp_set_current_user( $u3 );
    11581158
    11591159        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    11781178        $this->populate_group_with_members( array( $u1, $u3 ), $g1 );
    11791179
    1180         $this->bp::set_current_user( $u3 );
     1180        wp_set_current_user( $u3 );
    11811181
    11821182        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . $g1 . '/members/' . $u3 );
     
    11951195        $u = static::factory()->user->create();
    11961196
    1197         $this->bp::set_current_user( $this->user );
     1197        wp_set_current_user( $this->user );
    11981198
    11991199        $request = new WP_REST_Request( 'PUT', $this->endpoint_url . '/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER . '/members/' . $u );
     
    12371237        $this->populate_group_with_members( array( $u1, $u2 ), $g1 );
    12381238
    1239         $this->bp::set_current_user( $this->user );
     1239        wp_set_current_user( $this->user );
    12401240
    12411241        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    12701270        $this->populate_group_with_members( array( $u1, $u2 ), $g1 );
    12711271
    1272         $this->bp::set_current_user( $u1 );
     1272        wp_set_current_user( $u1 );
    12731273
    12741274        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    13041304        $group_member->ban();
    13051305
    1306         $this->bp::set_current_user( $u1 );
     1306        wp_set_current_user( $u1 );
    13071307
    13081308        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    13291329        $this->populate_group_with_members( array( $u1, $u2 ), $g1 );
    13301330
    1331         $this->bp::set_current_user( $u1 );
     1331        wp_set_current_user( $u1 );
    13321332
    13331333        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    13541354        $this->populate_group_with_members( array( $u1, $u2 ), $g1 );
    13551355
    1356         $this->bp::set_current_user( $u3 );
     1356        wp_set_current_user( $u3 );
    13571357
    13581358        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    13891389        $group_member->promote( 'admin' );
    13901390
    1391         $this->bp::set_current_user( $u2 );
     1391        wp_set_current_user( $u2 );
    13921392
    13931393        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    14191419        $this->populate_group_with_members( array( $u1 ), $g1 );
    14201420
    1421         $this->bp::set_current_user( $u2 );
     1421        wp_set_current_user( $u2 );
    14221422
    14231423        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u2 );
     
    14471447        $group_member->promote( 'admin' );
    14481448
    1449         $this->bp::set_current_user( $u3 );
     1449        wp_set_current_user( $u3 );
    14501450
    14511451        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    14781478        $this->populate_group_with_members( array( $u2, $u3 ), $g1 );
    14791479
    1480         $this->bp::set_current_user( $this->user );
     1480        wp_set_current_user( $this->user );
    14811481
    14821482        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $this->user );
     
    15061506        $group_member->promote( 'admin' );
    15071507
    1508         $this->bp::set_current_user( $this->user );
     1508        wp_set_current_user( $this->user );
    15091509
    15101510        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
     
    15361536        $this->populate_group_with_members( array( $u1, $u2 ), $g1 );
    15371537
    1538         $this->bp::set_current_user( $this->user );
     1538        wp_set_current_user( $this->user );
    15391539
    15401540        $request = new WP_REST_Request( 'DELETE', $this->endpoint_url . '/' . $g1 . '/members/' . $u1 );
  • trunk/tests/phpunit/testcases/groups/test-group-membership-request-controller.php

    r14026 r14070  
    8484        );
    8585
    86         $this->bp::set_current_user( $this->user );
     86        wp_set_current_user( $this->user );
    8787
    8888        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    162162        );
    163163
    164         $this->bp::set_current_user( $this->g1admin );
     164        wp_set_current_user( $this->g1admin );
    165165
    166166        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    192192        );
    193193
    194         $this->bp::set_current_user( $u );
     194        wp_set_current_user( $u );
    195195
    196196        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    213213     */
    214214    public function test_get_items_user_is_not_logged_in() {
    215         $this->bp::set_current_user( 0 );
     215        wp_set_current_user( 0 );
    216216
    217217        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    241241        );
    242242
    243         $this->bp::set_current_user( $u2 );
     243        wp_set_current_user( $u2 );
    244244        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
    245245        $request->set_query_params(
     
    268268        );
    269269
    270         $this->bp::set_current_user( $u2 );
     270        wp_set_current_user( $u2 );
    271271        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
    272272        $request->set_query_params(
     
    285285     */
    286286    public function test_get_items_invalid_group() {
    287         $this->bp::set_current_user( $this->user );
     287        wp_set_current_user( $this->user );
    288288
    289289        $request = new WP_REST_Request( 'GET', $this->endpoint_url );
     
    312312        );
    313313
    314         $this->bp::set_current_user( $this->user );
     314        wp_set_current_user( $this->user );
    315315
    316316        $request = new WP_REST_Request( 'GET', $this->endpoint_url . '/' . $request_id );
     
    361361        );
    362362
    363         $this->bp::set_current_user( 0 );
     363        wp_set_current_user( 0 );
    364364        $request = new WP_REST_Request( 'GET', $this->endpoint_url . '/' . $request_id );
    365365        $request->set_param( 'context', 'view' );
     
    373373     */
    374374    public function test_get_item_invalid_membership_request() {
    375         $this->bp::set_current_user( $this->user );
     375        wp_set_current_user( $this->user );
    376376
    377377        $request = new WP_REST_Request( 'GET', $this->endpoint_url . '/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
     
    396396        );
    397397
    398         $this->bp::set_current_user( $u2 );
     398        wp_set_current_user( $u2 );
    399399
    400400        $request = new WP_REST_Request( 'GET', $this->endpoint_url . '/' . $request_id );
     
    410410    public function test_create_item() {
    411411        $u = static::factory()->user->create();
    412         $this->bp::set_current_user( $this->user );
     412        wp_set_current_user( $this->user );
    413413
    414414        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    436436        $u = static::factory()->user->create();
    437437
    438         $this->bp::set_current_user( $u );
     438        wp_set_current_user( $u );
    439439
    440440        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    462462        $u = static::factory()->user->create();
    463463
    464         $this->bp::set_current_user( 0 );
     464        wp_set_current_user( 0 );
    465465
    466466        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    481481     */
    482482    public function test_create_item_invalid_member() {
    483         $this->bp::set_current_user( $this->user );
     483        wp_set_current_user( $this->user );
    484484
    485485        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    500500     */
    501501    public function test_create_item_invalid_group() {
    502         $this->bp::set_current_user( $this->user );
     502        wp_set_current_user( $this->user );
    503503
    504504        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    522522
    523523        $this->bp::add_user_to_group( $u, $this->group_id );
    524         $this->bp::set_current_user( $u );
     524        wp_set_current_user( $u );
    525525
    526526        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    551551        );
    552552
    553         $this->bp::set_current_user( $u );
     553        wp_set_current_user( $u );
    554554
    555555        $request = new WP_REST_Request( 'POST', $this->endpoint_url );
     
    571571    public function test_update_item() {
    572572        $u = static::factory()->user->create();
    573         $this->bp::set_current_user( $this->user );
     573        wp_set_current_user( $this->user );
    574574
    575575        $request_id = groups_send_membership_request(