Changeset 12484

Timestamp:

10/28/2019 07:49:19 PM (7 years ago)

Author:

imath

Message:

Revert [12483]

For further details see this ​discussion on slack

Props espellcaste, johnjamesjacoby

See #8151 (Branch 5.0)

Location:

branches/5.0

Files:

• src/bp-groups/classes/class-bp-groups-component.php (modified) (1 diff)
• src/bp-members/classes/class-bp-members-component.php (modified) (1 diff)
• src/bp-xprofile/classes/class-bp-xprofile-component.php (modified) (1 diff)
• tests/phpunit/assets/bp-rest-api-controllers.php (modified) (2 diffs)
• tests/phpunit/testcases/core/class-bp-component.php (modified) (3 diffs)

branches/5.0/src/bp-groups/classes/class-bp-groups-component.php

@@ -933 +933 @@
          */
         public function rest_api_init( $controllers = array() ) {
-                $controllers = array(
+                parent::rest_api_init( array(
                         'BP_REST_Groups_Endpoint',
                         'BP_REST_Group_Membership_Endpoint',
                         'BP_REST_Group_Invites_Endpoint',
                         'BP_REST_Group_Membership_Request_Endpoint',
-                );
-
-                // Only Load the Group's Avatar controller if Group Avatar uploads are allowed.
-                if ( ! bp_disable_group_avatar_uploads() ) {
-                        $controllers[] = 'BP_REST_Attachments_Group_Avatar_Endpoint';
-                }
-
-                parent::rest_api_init( $controllers );
+                        'BP_REST_Attachments_Group_Avatar_Endpoint',
+                ) );
         }
 }

branches/5.0/src/bp-members/classes/class-bp-members-component.php

@@ -474 +474 @@
                         'BP_REST_Components_Endpoint',
                         'BP_REST_Members_Endpoint',
+                        'BP_REST_Attachments_Member_Avatar_Endpoint',
                 ) );
         }

branches/5.0/src/bp-xprofile/classes/class-bp-xprofile-component.php

@@ -500 +500 @@
          */
         public function rest_api_init( $controllers = array() ) {
-                $controllers = array(
+                parent::rest_api_init( array(
                         'BP_REST_XProfile_Fields_Endpoint',
                         'BP_REST_XProfile_Field_Groups_Endpoint',
                         'BP_REST_XProfile_Data_Endpoint',
-                );
-
-                // Only Load the Member's Avatar controller if Avatar uploads are allowed.
-                if ( ! bp_disable_avatar_uploads() ) {
-                        $controllers[] = 'BP_REST_Attachments_Member_Avatar_Endpoint';
-                }
-
-                parent::rest_api_init( $controllers );
+                ) );
         }
 }

branches/5.0/tests/phpunit/assets/bp-rest-api-controllers.php

@@ -18 +18 @@
         public function __construct() {
                 $this->namespace = bp_rest_namespace() . '/' . bp_rest_version();
-                $this->rest_base = 'xprofile';
+                $this->rest_base = 'members';
         }
 
@@ -53 +53 @@
         }
 }
-
-/**
- * BP xProfiles Data REST Controller's mock.
- */
-class BP_REST_XProfile_Data_Endpoint extends BP_REST_Mock_Class {
-        public function __construct() {
-                $this->namespace = bp_rest_namespace() . '/' . bp_rest_version();
-                $this->rest_base = 'xprofile';
-        }
-
-        public function register_routes( $controller = '' ) {
-                parent::register_routes( 'BP_REST_XProfile_Data_Endpoint' );
-        }
-}
-
-/**
- * BP xProfiles Field Groups REST Controller's mock.
- */
-class BP_REST_XProfile_Field_Groups_Endpoint extends BP_REST_Mock_Class {
-        public function __construct() {
-                $this->namespace = bp_rest_namespace() . '/' . bp_rest_version();
-                $this->rest_base = 'xprofile/groups';
-        }
-
-        public function register_routes( $controller = '' ) {
-                parent::register_routes( 'BP_REST_XProfile_Field_Groups_Endpoint' );
-        }
-}
-
-/**
- * BP xProfiles Fields REST Controller's mock.
- */
-class BP_REST_XProfile_Fields_Endpoint extends BP_REST_Mock_Class {
-        public function __construct() {
-                $this->namespace = bp_rest_namespace() . '/' . bp_rest_version();
-                $this->rest_base = 'xprofile/fields';
-        }
-
-        public function register_routes( $controller = '' ) {
-                parent::register_routes( 'BP_REST_XProfile_Fields_Endpoint' );
-        }
-}

branches/5.0/tests/phpunit/testcases/core/class-bp-component.php

@@ -33 +33 @@
                         'BP_REST_Components_Endpoint',
                         'BP_REST_Members_Endpoint',
+                        'BP_REST_Attachments_Member_Avatar_Endpoint',
                 ) );
         }
@@ -48 +49 @@
                 $this->assertSame( $bp->unit_test_rest->controllers, array(
                         'BP_REST_Components_Endpoint',
+                        'BP_REST_Attachments_Member_Avatar_Endpoint',
                 ) );
         }
@@ -64 +66 @@
                         'BP_REST_Components_Endpoint',
                         'BP_REST_Members_Endpoint',
-                ) );
-        }
-
-        public function test_rest_api_init_for_xprofile_component() {
-                $bp_xprofile = new BP_XProfile_Component();
-                $bp          = buddypress();
-
-                $bp_xprofile->rest_api_init();
-
-                $this->assertSame( $bp->unit_test_rest->controllers, array(
-                        'BP_REST_XProfile_Fields_Endpoint',
-                        'BP_REST_XProfile_Field_Groups_Endpoint',
-                        'BP_REST_XProfile_Data_Endpoint',
                         'BP_REST_Attachments_Member_Avatar_Endpoint',
                 ) );
         }
-
-        public function test_rest_api_init_for_xprofile_component_without_avatar_enabled() {
-                add_filter( 'bp_disable_avatar_uploads', '__return_true' );
-
-                $bp_xprofile = new BP_XProfile_Component();
-                $bp          = buddypress();
-
-                $bp_xprofile->rest_api_init();
-
-                remove_filter( 'bp_disable_avatar_uploads', '__return_true' );
-
-                $this->assertSame( $bp->unit_test_rest->controllers, array(
-                        'BP_REST_XProfile_Fields_Endpoint',
-                        'BP_REST_XProfile_Field_Groups_Endpoint',
-                        'BP_REST_XProfile_Data_Endpoint',
-                ) );
-        }
 }