Ticket #53233: 53233.patch

src/wp-includes/blocks/index.php

@@ -59 +59 @@
         );
 
         foreach ( $block_folders as $block_folder ) {
-                register_block_type_from_metadata(
+                register_block_type(
                         ABSPATH . WPINC . '/blocks/' . $block_folder
                 );
         }

src/wp-includes/blocks.php

@@ -8 +8 @@
  */
 
 /**
- * Registers a block type.
- *
- * @since 5.0.0
- *
- * @param string|WP_Block_Type $name Block type name including namespace, or alternatively
- *                                   a complete WP_Block_Type instance. In case a WP_Block_Type
- *                                   is provided, the $args parameter will be ignored.
- * @param array                $args Optional. Array of block type arguments. Accepts any public property
- *                                   of `WP_Block_Type`. See WP_Block_Type::__construct() for information
- *                                   on accepted arguments. Default empty array.
- * @return WP_Block_Type|false The registered block type on success, or false on failure.
- */
-function register_block_type( $name, $args = array() ) {
-        return WP_Block_Type_Registry::get_instance()->register( $name, $args );
-}
-
-/**
- * Unregisters a block type.
- *
- * @since 5.0.0
- *
- * @param string|WP_Block_Type $name Block type name including namespace, or alternatively
- *                                   a complete WP_Block_Type instance.
- * @return WP_Block_Type|false The unregistered block type on success, or false on failure.
- */
-function unregister_block_type( $name ) {
-        return WP_Block_Type_Registry::get_instance()->unregister( $name );
-}
-
-/**
  * Removes the block asset's path prefix if provided.
  *
  * @since 5.5.0
@@ -204 +174 @@
 }
 
 /**
- * Registers a block type from metadata stored in the `block.json` file.
+ * Registers a block type from the metadata stored in the `block.json` file.
  *
  * @since 5.5.0
  *
@@ -348 +318 @@
                 $metadata
         );
 
-        return register_block_type(
+        return WP_Block_Type_Registry::get_instance()->register(
                 $metadata['name'],
                 $settings
         );
@@ -355 +325 @@
 }
 
 /**
+ * Registers a block type. The recommended way is to register a block type using
+ * the metadata stored in the `block.json` file.
+ *
+ * @since 5.0.0
+ *
+ * @param string|WP_Block_Type $block_type Block type name including namespace, or alternatively
+ *                                         a path to the JSON file with metadata definition for the block,
+ *                                         or a path to the folder where the `block.json` file is located,
+ *                                         or a complete WP_Block_Type instance.
+ *                                         In case a WP_Block_Type is provided, the $args parameter will be ignored.
+ * @param array                $args       Optional. Array of block type arguments. Accepts any public property
+ *                                         of `WP_Block_Type`. See WP_Block_Type::__construct() for information
+ *                                         on accepted arguments. Default empty array.
+ *
+ * @return WP_Block_Type|false The registered block type on success, or false on failure.
+ */
+function register_block_type( $block_type, $args = array() ) {
+        if ( is_string( $block_type ) && file_exists( $block_type ) ) {
+                return register_block_type_from_metadata( $block_type, $args );
+        }
+
+        return WP_Block_Type_Registry::get_instance()->register( $block_type, $args );
+}
+
+/**
+ * Unregisters a block type.
+ *
+ * @since 5.0.0
+ *
+ * @param string|WP_Block_Type $name Block type name including namespace, or alternatively
+ *                                   a complete WP_Block_Type instance.
+ * @return WP_Block_Type|false The unregistered block type on success, or false on failure.
+ */
+function unregister_block_type( $name ) {
+        return WP_Block_Type_Registry::get_instance()->unregister( $name );
+}
+
+/**
  * Determine whether a post or content string has blocks.
  *
  * This test optimizes for performance rather than strict accuracy, detecting

tests/phpunit/tests/blocks/register.php

@@ -383 +383 @@
         }
 
         /**
+         * @ticket 53233
+         */
+        function test_block_register_block_type_proxy_for_metadata() {
+                $result = register_block_type(
+                        DIR_TESTDATA . '/blocks/notice'
+                );
+
+                $this->assertInstanceOf( 'WP_Block_Type', $result );
+                $this->assertSame( 'tests/notice', $result->name );
+        }
+
+        /**
          * @ticket 52301
          */
         function test_block_registers_with_metadata_i18n_support() {