Remove pattern directory categories endpoint (WordPress#51340)

* Remove pattern directories endpoint * fix init
pewresearch · Jul 13, 2023 · bf3e84b · bf3e84b
1 parent 88eb948
commit bf3e84b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 176 deletions.
diff --git a/lib/compat/wordpress-6.2/rest-api.php b/lib/compat/wordpress-6.2/rest-api.php
@@ -139,3 +139,13 @@ function filter_block_pattern_response( $response, $raw_pattern ) {
 	return $response;
 }
 add_filter( 'rest_prepare_block_pattern', 'filter_block_pattern_response', 10, 2 );
+
+
+/**
+ * Registers the block pattern directory.
+ */
+function gutenberg_register_rest_pattern_directory() {
+	$pattern_directory_controller = new Gutenberg_REST_Pattern_Directory_Controller_6_2();
+	$pattern_directory_controller->register_routes();
+}
+add_action( 'rest_api_init', 'gutenberg_register_rest_pattern_directory' );
diff --git a/lib/compat/wordpress-6.3/class-gutenberg-rest-pattern-directory-controller-6-3.php b/lib/compat/wordpress-6.3/class-gutenberg-rest-pattern-directory-controller-6-3.php
diff --git a/lib/compat/wordpress-6.3/rest-api.php b/lib/compat/wordpress-6.3/rest-api.php
@@ -5,15 +5,6 @@
  * @package gutenberg
  */
 
-/**
- * Registers the block pattern directory.
- */
-function gutenberg_register_rest_pattern_directory() {
-	$pattern_directory_controller = new Gutenberg_REST_Pattern_Directory_Controller_6_3();
-	$pattern_directory_controller->register_routes();
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_pattern_directory' );
-
 /**
  * Updates `wp_template` and `wp_template_part` post types to use
  * Gutenberg's REST controllers

diff --git a/lib/load.php b/lib/load.php
@@ -44,7 +44,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require_once __DIR__ . '/compat/wordpress-6.2/class-gutenberg-rest-global-styles-controller-6-2.php';
 
 	// WordPress 6.3 compat.
-	require_once __DIR__ . '/compat/wordpress-6.3/class-gutenberg-rest-pattern-directory-controller-6-3.php';
 	require_once __DIR__ . '/compat/wordpress-6.3/class-gutenberg-rest-templates-controller-6-3.php';
 	require_once __DIR__ . '/compat/wordpress-6.3/class-gutenberg-rest-global-styles-controller-6-3.php';
 	require_once __DIR__ . '/compat/wordpress-6.3/rest-api.php';

diff --git a/phpunit/class-wp-rest-pattern-directory-controller-test.php b/phpunit/class-wp-rest-pattern-directory-controller-test.php
@@ -53,7 +53,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 
 		self::$http_request_urls = array();
 
-		static::$controller = new Gutenberg_REST_Pattern_Directory_Controller_6_3();
+		static::$controller = new Gutenberg_REST_Pattern_Directory_Controller_6_2();
 	}
 
 	public static function wpTearDownAfterClass() {
@@ -78,39 +78,8 @@ public function test_register_routes() {
 		$routes = rest_get_server()->get_routes();
 
 		$this->assertArrayHasKey( '/wp/v2/pattern-directory/patterns', $routes );
-		$this->assertArrayHasKey( '/wp/v2/pattern-directory/categories', $routes );
 	}
 
-	/**
-	 * @covers WP_REST_Pattern_Directory_Controller::prepare_pattern_category_for_response
-	 *
-	 * @since 6.2.0
-	 */
-	public function test_prepare_pattern_category_for_response() {
-		$raw_categories = array(
-			(object) array(
-				'id'          => 3,
-				'name'        => 'Columns',
-				'slug'        => 'columns',
-				'description' => 'A description',
-			),
-		);
-
-		$prepared_category = static::$controller->prepare_response_for_collection(
-			static::$controller->prepare_pattern_category_for_response( $raw_categories[0], new WP_REST_Request() )
-		);
-
-		$this->assertSame(
-			array(
-				'id'   => 3,
-				'name' => 'Columns',
-				'slug' => 'columns',
-			),
-			$prepared_category
-		);
-	}
-
-
 	/**
 	 * Tests if the provided query args are passed through to the wp.org API.
 	 *
@@ -317,5 +286,4 @@ public function test_delete_item() {
 	public function test_get_item_schema() {
 		// The controller's schema is hardcoded, so tests would not be meaningful.
 	}
-
 }