Changeset 52017

Timestamp:

11/05/2021 02:29:32 AM (3 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Support subdirectory themes in the Themes controller.

This allows for themes that are included inside of a subdirectory, for example subdir/my-theme, to be accessed via the single item route of the /wp/v2/themes controller.

Fixes #54349.

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php (modified) (2 diffs)
• tests/phpunit/tests/rest-api/rest-schema-setup.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-themes-controller.php (modified) (2 diffs)
• tests/qunit/fixtures/wp-api-generated.js (modified) (1 diff)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php

@@ -16 +16 @@
  */
 class WP_REST_Themes_Controller extends WP_REST_Controller {
+
+    const PATTERN = '[^.\/]+(?:\/[^.\/]+)?';
 
     /**
@@ -51 +53 @@
         register_rest_route(
             $this->namespace,
-            '/' . $this->rest_base . '/(?P<stylesheet>[\w-]+)',
+            sprintf( '/%s/(?P<stylesheet>%s)', $this->rest_base, self::PATTERN ),
             array(
                 'args'   => array(

trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php

@@ -138 +138 @@
             '/wp/v2/templates/(?P<parent>[\d]+)/revisions/(?P<id>[\d]+)',
             '/wp/v2/themes',
-            '/wp/v2/themes/(?P<stylesheet>[\w-]+)',
+            '/wp/v2/themes/(?P<stylesheet>[^.\/]+(?:\/[^.\/]+)?)',
             '/wp/v2/plugins',
             '/wp/v2/plugins/(?P<plugin>[^.\/]+(?:\/[^.\/]+)?)',

trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php

@@ -152 +152 @@
         $routes = rest_get_server()->get_routes();
         $this->assertArrayHasKey( self::$themes_route, $routes );
-        $this->assertArrayHasKey( self::$themes_route . '/(?P<stylesheet>[\\w-]+)', $routes );
+        $this->assertArrayHasKey(
+            sprintf( '%s/(?P<stylesheet>%s)', self::$themes_route, WP_REST_Themes_Controller::PATTERN ),
+            $routes
+        );
     }
 
@@ -1283 +1286 @@
 
     /**
+     * @ticket 54349
+     */
+    public function test_get_item_subdirectory_theme() {
+        wp_set_current_user( self::$admin_id );
+        $request  = new WP_REST_Request( 'GET', self::$themes_route . '/subdir/theme2' );
+        $response = rest_do_request( $request );
+
+        $this->assertSame( 200, $response->get_status() );
+        $this->assertSame( 'My Subdir Theme', $response->get_data()['name']['raw'] );
+    }
+
+    /**
+     * @ticket 54349
+     */
+    public function test_can_support_further_routes() {
+        register_rest_route(
+            'wp/v2',
+            sprintf( '/themes/(?P<stylesheet>%s)//test', WP_REST_Themes_Controller::PATTERN ),
+            array(
+                'callback'            => function ( WP_REST_Request $request ) {
+                    return $request['stylesheet'];
+                },
+                'permission_callback' => '__return_true',
+            )
+        );
+
+        wp_set_current_user( self::$admin_id );
+
+        $response = rest_do_request( self::$themes_route . '/default//test' );
+        $this->assertSame( 'default', $response->get_data() );
+
+        $response = rest_do_request( self::$themes_route . '/subdir/theme2//test' );
+        $this->assertSame( 'subdir/theme2', $response->get_data() );
+    }
+
+    /**
      * The delete_item() method does not exist for themes.
      */

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -6710 +6710 @@
             }
         },
-        "/wp/v2/themes/(?P<stylesheet>[\\w-]+)": {
+        "/wp/v2/themes/(?P<stylesheet>[^.\\/]+(?:\\/[^.\\/]+)?)": {
             "namespace": "wp/v2",
             "methods": [