From 106b13f63d8acd00a9b71125474ea984beea5ce9 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:20:25 -0700 Subject: [PATCH 01/14] Update to stable namespace. See https://github.com/WordPress/wordpress-develop/pull/2488/files#r844106313. --- .../class-wp-rest-block-pattern-categories-controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php index 3e44c88f5e6a3..4b3e0f52024b9 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php @@ -22,7 +22,7 @@ class WP_REST_Block_Pattern_Categories_Controller extends WP_REST_Controller { * @since 6.0.0 */ public function __construct() { - $this->namespace = '__experimental'; + $this->namespace = 'wp/v2'; $this->rest_base = 'block-patterns/categories'; } From 952286e62d44aed3c4a595f1006104137ed25008 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:21:19 -0700 Subject: [PATCH 02/14] Update test to use stable namespace. See https://github.com/WordPress/wordpress-develop/pull/2488/files#r844106313. --- .../tests/rest-api/wpRestBlockPatternCategoriesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php b/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php index 898b519aca546..e9ddd0e554eba 100644 --- a/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php +++ b/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php @@ -43,7 +43,7 @@ class Tests_REST_WpRestBlockPatternCategoriesController extends WP_Test_REST_Con * * @var string */ - const REQUEST_ROUTE = '/__experimental/block-patterns/categories'; + const REQUEST_ROUTE = '/wp/v2/block-patterns/categories'; /** * Set up class test fixtures. From d81747cc8d330d65b3960fd47c3ac3044f2ce110 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:22:40 -0700 Subject: [PATCH 03/14] Register routes for WP_REST_Block_Pattern_Categories_Controller See https://github.com/WordPress/wordpress-develop/pull/2488#issuecomment-1090430384. --- src/wp-includes/rest-api.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php index a7cd0178b0a42..02c06595ebed9 100644 --- a/src/wp-includes/rest-api.php +++ b/src/wp-includes/rest-api.php @@ -337,6 +337,10 @@ function create_initial_rest_routes() { $controller = new WP_REST_Pattern_Directory_Controller(); $controller->register_routes(); + // Block Pattern Categories. + $controller = new WP_REST_Block_Pattern_Categories_Controller(); + $controller->register_routes(); + // Site Health. $site_health = WP_Site_Health::get_instance(); $controller = new WP_REST_Site_Health_Controller( $site_health ); From 0fdc8aa0bdb0ad4e89e21dcb1810eaac16d51001 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:23:45 -0700 Subject: [PATCH 04/14] Require class file for WP_REST_Block_Pattern_Categories_Controller See https://github.com/WordPress/wordpress-develop/pull/2488#issuecomment-1090430384. --- src/wp-settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wp-settings.php b/src/wp-settings.php index 355cb689bbeb1..34858c16ec0e6 100644 --- a/src/wp-settings.php +++ b/src/wp-settings.php @@ -277,6 +277,7 @@ require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-directory-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-edit-site-export-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php'; +require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-application-passwords-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-site-health-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-sidebars-controller.php'; From 114a651877addffacbcf408a46719bef4bb0df57 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:27:28 -0700 Subject: [PATCH 05/14] Move endpoint to stable namespace. See https://github.com/WordPress/wordpress-develop/pull/2488#discussion_r844076857. --- .../endpoints/class-wp-rest-block-patterns-controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php index bcba27fc5e569..0d6241346e677 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php @@ -22,7 +22,7 @@ class WP_REST_Block_Patterns_Controller extends WP_REST_Controller { * @since 6.0.0 */ public function __construct() { - $this->namespace = '__experimental'; + $this->namespace = 'wp/v2'; $this->rest_base = 'block-patterns/patterns'; } From a2a976d6f78d0e2775e3e8f7eaa69bb23eef30e0 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:29:05 -0700 Subject: [PATCH 06/14] Update expected route for WP_REST_Block_Patterns_Controller See https://github.com/WordPress/wordpress-develop/pull/2488#discussion_r844076857. --- tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php index 5bba00115dbe4..e8aebf0156157 100644 --- a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php +++ b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php @@ -43,7 +43,7 @@ class Tests_REST_WpRestBlockPatternsController extends WP_Test_REST_Controller_T * * @var string */ - const REQUEST_ROUTE = '/__experimental/block-patterns/patterns'; + const REQUEST_ROUTE = '/wp/v2/block-patterns/patterns'; /** * Set up class test fixtures. From 96ccc815c0f48ff49f0d04e1f08226ed8ca1a6c9 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:29:21 -0700 Subject: [PATCH 07/14] Remove empty line --- tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php index e8aebf0156157..f76d44366be2f 100644 --- a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php +++ b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php @@ -100,7 +100,6 @@ public function set_up() { public function test_register_routes() { $routes = rest_get_server()->get_routes(); $this->assertArrayHasKey( static::REQUEST_ROUTE, $routes ); - } public function test_get_items() { From 46a8bfdf3884e76b3a546a6206636b7f14dfbf8a Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:30:09 -0700 Subject: [PATCH 08/14] Require class file for WP_REST_Block_Patterns_Controller --- src/wp-settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wp-settings.php b/src/wp-settings.php index 34858c16ec0e6..a396b413ae4c6 100644 --- a/src/wp-settings.php +++ b/src/wp-settings.php @@ -277,6 +277,7 @@ require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-directory-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-edit-site-export-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php'; +require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-patterns-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-application-passwords-controller.php'; require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-site-health-controller.php'; From 5c7526d3c3d31ec3c6e62a14c56a4a8c1b9dae42 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 15:30:30 -0700 Subject: [PATCH 09/14] Register routes for WP_REST_Block_Patterns_Controller --- src/wp-includes/rest-api.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php index 02c06595ebed9..941aa25f12066 100644 --- a/src/wp-includes/rest-api.php +++ b/src/wp-includes/rest-api.php @@ -337,6 +337,10 @@ function create_initial_rest_routes() { $controller = new WP_REST_Pattern_Directory_Controller(); $controller->register_routes(); + // Block Patterns. + $controller = new WP_REST_Block_Patterns_Controller(); + $controller->register_routes(); + // Block Pattern Categories. $controller = new WP_REST_Block_Pattern_Categories_Controller(); $controller->register_routes(); From 34b702a52312d44c43cefe58b2a55d255be2fed9 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 16:16:40 -0700 Subject: [PATCH 10/14] Fix annotation to `@access private` --- src/wp-includes/block-patterns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/block-patterns.php b/src/wp-includes/block-patterns.php index e0530c795502c..32dc5816e56c9 100644 --- a/src/wp-includes/block-patterns.php +++ b/src/wp-includes/block-patterns.php @@ -11,8 +11,8 @@ /** * Registers the core block patterns and categories. * + * @access private * @since 5.5.0 - * @private */ function _register_core_block_patterns_and_categories() { $should_register_core_patterns = get_theme_support( 'core-block-patterns' ); From 903da3ab3fc6e4c5abea625efe5bf1ff9c7fb7f9 Mon Sep 17 00:00:00 2001 From: Brian Alexander <824344+ironprogrammer@users.noreply.github.com> Date: Wed, 6 Apr 2022 16:18:09 -0700 Subject: [PATCH 11/14] Arrange DocBlock annotation order for consistency --- src/wp-includes/block-patterns.php | 4 ++-- src/wp-includes/blocks.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/block-patterns.php b/src/wp-includes/block-patterns.php index 32dc5816e56c9..77218436e49dc 100644 --- a/src/wp-includes/block-patterns.php +++ b/src/wp-includes/block-patterns.php @@ -132,8 +132,8 @@ function _load_remote_featured_patterns() { * Registers patterns from Pattern Directory provided by a theme's * `theme.json` file. * - * @since 6.0.0 * @access private + * @since 6.0.0 */ function _register_remote_theme_patterns() { if ( ! get_theme_support( 'core-block-patterns' ) ) { @@ -196,8 +196,8 @@ function _register_remote_theme_patterns() { * - Block Types (comma-separated values) * - Inserter (yes/no) * - * @since 6.0.0 * @access private + * @since 6.0.0 */ function _register_theme_block_patterns() { $default_headers = array( diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 44b7631d3c7a1..f2331108bb0f6 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -788,8 +788,8 @@ function excerpt_remove_blocks( $content ) { * Render inner blocks from the allowed wrapper blocks * for generating an excerpt. * - * @since 5.8.0 * @access private + * @since 5.8.0 * * @param array $parsed_block The parsed block. * @param array $allowed_blocks The list of allowed inner blocks. @@ -940,7 +940,6 @@ function do_blocks( $content ) { * for subsequent `the_content` usage. * * @access private - * * @since 5.0.0 * * @param string $content The post content running through this filter. From c77c9c2057a7c58a501f2632b663297cd7207dc8 Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Thu, 7 Apr 2022 08:35:12 -0500 Subject: [PATCH 12/14] Reorder `access` annotation to after `since` for consistency. --- src/wp-includes/block-patterns.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/block-patterns.php b/src/wp-includes/block-patterns.php index 77218436e49dc..b9f7d6689ff84 100644 --- a/src/wp-includes/block-patterns.php +++ b/src/wp-includes/block-patterns.php @@ -11,8 +11,8 @@ /** * Registers the core block patterns and categories. * - * @access private * @since 5.5.0 + * @access private */ function _register_core_block_patterns_and_categories() { $should_register_core_patterns = get_theme_support( 'core-block-patterns' ); @@ -132,8 +132,8 @@ function _load_remote_featured_patterns() { * Registers patterns from Pattern Directory provided by a theme's * `theme.json` file. * - * @access private * @since 6.0.0 + * @access private */ function _register_remote_theme_patterns() { if ( ! get_theme_support( 'core-block-patterns' ) ) { @@ -196,8 +196,8 @@ function _register_remote_theme_patterns() { * - Block Types (comma-separated values) * - Inserter (yes/no) * - * @access private * @since 6.0.0 + * @access private */ function _register_theme_block_patterns() { $default_headers = array( From e9311168b9e18dcb79d1b700d3368deaa4a49ff9 Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Thu, 7 Apr 2022 08:39:09 -0500 Subject: [PATCH 13/14] More reordering of since + access annontations. --- src/wp-includes/block-patterns.php | 2 +- src/wp-includes/blocks.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/block-patterns.php b/src/wp-includes/block-patterns.php index b9f7d6689ff84..6e03345e3ba50 100644 --- a/src/wp-includes/block-patterns.php +++ b/src/wp-includes/block-patterns.php @@ -197,7 +197,7 @@ function _register_remote_theme_patterns() { * - Inserter (yes/no) * * @since 6.0.0 - * @access private + * @access private */ function _register_theme_block_patterns() { $default_headers = array( diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index f2331108bb0f6..10816f1035f2a 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -788,8 +788,8 @@ function excerpt_remove_blocks( $content ) { * Render inner blocks from the allowed wrapper blocks * for generating an excerpt. * - * @access private * @since 5.8.0 + * @access private * * @param array $parsed_block The parsed block. * @param array $allowed_blocks The list of allowed inner blocks. From e212b188dd6e2db9618a1b7b431a1f7b9cf6781f Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Thu, 7 Apr 2022 08:40:34 -0500 Subject: [PATCH 14/14] Reorder annotation in blocks.php. --- src/wp-includes/blocks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php index 10816f1035f2a..cd5f09eb8d010 100644 --- a/src/wp-includes/blocks.php +++ b/src/wp-includes/blocks.php @@ -939,8 +939,8 @@ function do_blocks( $content ) { * If do_blocks() needs to remove wpautop() from the `the_content` filter, this re-adds it afterwards, * for subsequent `the_content` usage. * - * @access private * @since 5.0.0 + * @access private * * @param string $content The post content running through this filter. * @return string The unmodified content.