Changeset 14026 for trunk/src/bp-members/classes/class-bp-members-component.php

Timestamp:

09/27/2024 09:11:27 PM (15 months ago)

Author:

espellcaste

Message:

Include the V2 of the BP REST API in BuddyPress core.

We are officially deprecating the V1 of the BP REST API. And bundling the new, default, V2 of the BP REST API inside BuddyPress core. Previously, the V1 was developed as a plugin in a separate repo (​https://github.com/buddypress/BP-REST).

• One of the main differences between the V1 and V2 is how objects are returned. Single items are no longer returned as an array;
• We have a new BP_Test_REST_Controller_Testcase for testing the new API endpoints;
• We changed the names of our controllers to follow our autoloader rules;
• Removed the BP-REST plugin from wp-env and from our release script;
• And we added notices for the deprecated V1 API (endpoints and files).

Props imath & I. ;)

Fixes #8200
See #9145
Closes ​https://github.com/buddypress/buddypress/pull/337

File:

• trunk/src/bp-members/classes/class-bp-members-component.php (modified) (13 diffs)

trunk/src/bp-members/classes/class-bp-members-component.php

@@ -121 +121 @@
          * bp-members/bp-members-template.php.
          */
-        $signup_allowed = apply_filters( 'bp_get_signup_allowed', (bool) bp_get_option( 'users_can_register' ) );
+        $signup_allowed              = apply_filters( 'bp_get_signup_allowed', (bool) bp_get_option( 'users_can_register' ) );
         $membership_requests_enabled = (bool) bp_get_option( 'bp-enable-membership-requests' );
         if ( bp_is_active( 'members', 'membership_requests' ) && ! $signup_allowed && $membership_requests_enabled ) {
@@ -166 +166 @@
 
             // Action - Delete avatar.
-            if ( is_user_logged_in()&& bp_is_user_change_avatar() && bp_is_action_variable( 'delete-avatar', 0 ) ) {
+            if ( is_user_logged_in() && bp_is_user_change_avatar() && bp_is_action_variable( 'delete-avatar', 0 ) ) {
                 require_once $this->path . 'bp-members/actions/delete-avatar.php';
             }
@@ -216 +216 @@
 
         // Check the parsed query is consistent with the Members navigation.
-        add_action( 'bp_parse_query',  array( $this, 'check_parsed_query' ), 999, 0 );
+        add_action( 'bp_parse_query', array( $this, 'check_parsed_query' ), 999, 0 );
     }
 
@@ -281 +281 @@
          */
 
-        $bp->signup = new stdClass;
+        $bp->signup = new stdClass();
 
         /** Profiles Fallback ************************************************
@@ -287 +287 @@
 
         if ( ! bp_is_active( 'xprofile' ) ) {
-            $bp->profile       = new stdClass;
+            $bp->profile       = new stdClass();
             $bp->profile->slug = 'profile';
             $bp->profile->id   = 'profile';
@@ -295 +295 @@
          */
 
-        $bp->members->invitations = new stdClass;
+        $bp->members->invitations = new stdClass();
     }
 
@@ -328 +328 @@
         // Fetch the default directory title.
         $default_directory_titles = bp_core_get_directory_page_default_titles();
-        $default_directory_title  = $default_directory_titles[$this->id];
+        $default_directory_title  = $default_directory_titles[ $this->id ];
 
         // Override any passed args.
         $args = array(
-            'slug'            => $default_slug,
-            'root_slug'       => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : $default_slug,
-            'has_directory'   => true,
-            'rewrite_ids'     => array(
+            'slug'                  => $default_slug,
+            'root_slug'             => isset( $bp->pages->members->slug ) ? $bp->pages->members->slug : $default_slug,
+            'has_directory'         => true,
+            'rewrite_ids'           => array(
                 'directory'                    => 'members',
                 'directory_type'               => 'members_type',
@@ -346 +346 @@
                 'member_activate_key'          => 'activate_key',
             ),
-            'directory_title' => isset( $bp->pages->members->title ) ? $bp->pages->members->title : $default_directory_title,
-            'search_string'   => __( 'Search Members...', 'buddypress' ),
-            'global_tables'   => array(
+            'directory_title'       => isset( $bp->pages->members->title ) ? $bp->pages->members->title : $default_directory_title,
+            'search_string'         => __( 'Search Members...', 'buddypress' ),
+            'global_tables'         => array(
                 'table_name_invitations'   => bp_core_get_table_prefix() . 'bp_invitations',
                 'table_name_last_activity' => bp_core_get_table_prefix() . 'bp_activity',
@@ -359 +359 @@
                     'widget_classnames' => array( 'widget_bp_core_members_widget', 'buddypress' ),
                 ),
-                'bp/online-members' => array(
+                'bp/online-members'  => array(
                     'widget_classnames' => array( 'widget_bp_core_whos_online_widget', 'buddypress' ),
                 ),
-                'bp/active-members' => array(
+                'bp/active-members'  => array(
                     'widget_classnames' => array( 'widget_bp_core_recently_active_widget', 'buddypress' ),
                 ),
@@ -616 +616 @@
                 $wp_admin_nav = array_merge( $wp_admin_nav, $this->get_avatar_cover_image_admin_navs() );
 
-            /**
-             * The xProfile is active.
-             *
-             * Add the Change Avatar and Change Cover Image Admin Bar items
-             * to the xProfile Admin Bar Menu.
-             */
+                /**
+                 * The xProfile is active.
+                 *
+                 * Add the Change Avatar and Change Cover Image Admin Bar items
+                 * to the xProfile Admin Bar Menu.
+                 */
             } else {
                 add_filter( 'bp_xprofile_admin_nav', array( $this, 'setup_xprofile_admin_nav' ), 2 );
@@ -661 +661 @@
         } elseif ( bp_is_user() ) {
             $bp->bp_options_title  = bp_get_displayed_user_fullname();
-            $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                'item_id' => bp_displayed_user_id(),
-                'type'    => 'thumb',
-                /* translators: %s: member name */
-                'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->bp_options_title )
-            ) );
+            $bp->bp_options_avatar = bp_core_fetch_avatar(
+                array(
+                    'item_id' => bp_displayed_user_id(),
+                    'type'    => 'thumb',
+                    /* translators: %s: member name */
+                    'alt'     => sprintf( __( 'Profile picture of %s', 'buddypress' ), $bp->bp_options_title ),
+                )
+            );
         }
 
@@ -1062 +1064 @@
     public function rest_api_init( $controllers = array() ) {
         $controllers = array(
-            'BP_REST_Members_Endpoint',
-            'BP_REST_Attachments_Member_Avatar_Endpoint',
+            'BP_Members_REST_Controller',
+            'BP_Members_Avatar_REST_Controller',
         );
 
         if ( bp_is_active( 'members', 'cover_image' ) ) {
-            $controllers[] = 'BP_REST_Attachments_Member_Cover_Endpoint';
+            $controllers[] = 'BP_Members_Cover_REST_Controller';
         }
 
         if ( bp_get_signup_allowed() ) {
-            $controllers[] = 'BP_REST_Signup_Endpoint';
+            $controllers[] = 'BP_Members_Signup_REST_Controller';
         }
 
@@ -1089 +1091 @@
         parent::blocks_init(
             array(
-                'bp/member' => array(
+                'bp/member'          => array(
                     'metadata'        => trailingslashit( buddypress()->plugin_dir ) . 'bp-members/blocks/member',
                     'render_callback' => 'bp_members_render_member_block',
                 ),
-                'bp/members' => array(
+                'bp/members'         => array(
                     'metadata'        => trailingslashit( buddypress()->plugin_dir ) . 'bp-members/blocks/members',
                     'render_callback' => 'bp_members_render_members_block',