Ticket #8511: 8511.patch

src/bp-blogs/classes/class-bp-blogs-component.php

@@ -379 +379 @@
 
                 parent::rest_api_init( $controllers );
         }
+
+        /**
+         * Register the BP Blogs Blocks.
+         *
+         * @since 9.0.0
+         *
+         * @param array $blocks Optional. See BP_Component::blocks_init() for
+         *                      description.
+         */
+        public function blocks_init( $blocks = array() ) {
+                parent::blocks_init( array() );
+        }
 }

src/bp-core/classes/class-bp-block.php

@@ -47 +47 @@
          *
          * @since 6.0.0
          *
-         * @param array $args The registration arguments for the BP Block.
+         * @param array $args {
+         *     The registration arguments for the BP Block. Part of the arguments are the ones
+         *     used by `WP_Block_Type`. Below are BP specific arguments.
+         *
+         *     @type string $name               The name of the block (eg: `bp/member`).
+         *     @type string $editor_script_url  URL to the JavaScript main file of the BP Block
+         *                                      to load into the Block Editor.
+         *     @type array  $editor_script_deps The list of JavaScript dependency handles for the
+         *                                      BP Block main file.
+         *     @type string $script_url         URL to the JavaScript file to load into the Block
+         *                                      Editor and on front-end.
+         *     @type array  $script_deps        The list of JavaScript dependency handles for the
+         *                                      JavaScript file to load into the Block Editor and
+         *                                      on front-end.
+         *     @type string $editor_style_url   URL to the CSS main file of the BP Block to load
+         *                                      into the Block Editor.
+         *     @type array  $editor_style_deps  The list of CSS dependency handles for the
+         *                                      CSS main file.
+         *     @type string $style_url          URL to the CSS file to load into the Block Editor
+         *                                      and on front-end.
+         *     @type array  $style_deps         The list of CSS dependency handles for the CSS file
+         *                                      to load into the Block Editor and on front-end.
+         * }
          */
         public function __construct( $args ) {
                 if ( ! did_action( 'bp_blocks_init' ) ) {

src/bp-core/classes/class-bp-component.php

@@ -917 +917 @@
          *
          * @since 6.0.0
          *
+         * @see `BP_Block->construct()` for a full description of a BP Block arguments.
+         *
          * @param array $blocks The list of BP Blocks to register.
          */
         public function blocks_init( $blocks = array() ) {
-                if ( is_array( $blocks ) && $blocks ) {
-                        /**
-                         * Filter here to disable all or some BP Blocks for a component.
-                         *
-                         * This is a dynamic hook that is based on the component string ID.
-                         *
-                         * @since 6.0.0
-                         *
-                         * @param array $blocks The list of BP Blocks for the component.
-                         */
-                        $blocks = (array) apply_filters( 'bp_' . $this->id . '_register_blocks', $blocks );
+                /**
+                 * Filter here to add new BP Blocks, disable some or all BP Blocks for a component.
+                 *
+                 * This is a dynamic hook that is based on the component string ID.
+                 *
+                 * @since 6.0.0
+                 *
+                 * @param array $blocks The list of BP Blocks for the component.
+                 */
+                $blocks = (array) apply_filters( 'bp_' . $this->id . '_register_blocks', $blocks );
+                $blocks = array_filter( $blocks );
 
+                if ( $blocks ) {
                         foreach ( $blocks as $block ) {
                                 bp_register_block( $block );
                         }

src/bp-core/classes/class-bp-core.php

@@ -351 +351 @@
 
                 parent::register_post_types();
         }
+
+        /**
+         * Init the Core controllers of the BP REST API.
+         *
+         * @since 9.0.0
+         *
+         * @param array $controllers Optional. See BP_Component::rest_api_init() for
+         *                           description.
+         */
+        public function rest_api_init( $controllers = array() ) {
+                $controllers = array(
+                        'BP_REST_Components_Endpoint',
+                );
+
+                parent::rest_api_init( $controllers );
+        }
+
+        /**
+         * Register the BP Core Blocks.
+         *
+         * @since 9.0.0
+         *
+         * @param array $blocks Optional. See BP_Component::blocks_init() for
+         *                      description.
+         */
+        public function blocks_init( $blocks = array() ) {
+                parent::blocks_init( array() );
+        }
 }

src/bp-friends/classes/class-bp-friends-component.php

@@ -337 +337 @@
         public function rest_api_init( $controllers = array() ) {
                 parent::rest_api_init( array( 'BP_REST_Friends_Endpoint' ) );
         }
+
+        /**
+         * Register the BP Friends Blocks.
+         *
+         * @since 9.0.0
+         *
+         * @param array $blocks Optional. See BP_Component::blocks_init() for
+         *                      description.
+         */
+        public function blocks_init( $blocks = array() ) {
+                parent::blocks_init( array() );
+        }
 }

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

@@ -695 +695 @@
          *
          * @since 5.0.0
          * @since 6.0.0 Adds the Member Cover and Signup REST endpoints.
+         * @since 9.0.0 Moves the `BP_REST_Components_Endpoint` controller in `BP_Core` component.
          *
          * @param array $controllers Optional. See BP_Component::rest_api_init() for
          *                           description.
          */
         public function rest_api_init( $controllers = array() ) {
                 $controllers = array(
-                        /**
-                         * As the Members component is always loaded,
-                         * let's register the Components endpoint here.
-                         */
-                        'BP_REST_Components_Endpoint',
                         'BP_REST_Members_Endpoint',
                         'BP_REST_Attachments_Member_Avatar_Endpoint',
                 );

src/bp-messages/classes/class-bp-messages-component.php

@@ -445 +445 @@
         public function rest_api_init( $controllers = array() ) {
                 parent::rest_api_init( array( 'BP_REST_Messages_Endpoint' ) );
         }
+
+        /**
+         * Register the BP Messages Blocks.
+         *
+         * @since 9.0.0
+         *
+         * @param array $blocks Optional. See BP_Component::blocks_init() for
+         *                      description.
+         */
+        public function blocks_init( $blocks = array() ) {
+                parent::blocks_init( array() );
+        }
 }

src/bp-settings/classes/class-bp-settings-component.php

@@ -292 +292 @@
 
                 parent::setup_admin_bar( $wp_admin_nav );
         }
+
+        /**
+         * Register the BP Settings Blocks.
+         *
+         * @since 9.0.0
+         *
+         * @param array $blocks Optional. See BP_Component::blocks_init() for
+         *                      description.
+         */
+        public function blocks_init( $blocks = array() ) {
+                parent::blocks_init( array() );
+        }
 }

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

@@ -456 +456 @@
                         'BP_REST_XProfile_Data_Endpoint',
                 ) );
         }
+
+        /**
+         * Register the BP xProfile Blocks.
+         *
+         * @since 9.0.0
+         *
+         * @param array $blocks Optional. See BP_Component::blocks_init() for
+         *                      description.
+         */
+        public function blocks_init( $blocks = array() ) {
+                parent::blocks_init( array() );
+        }
 }