Changeset 51648

Timestamp:

08/20/2021 11:43:21 PM (2 years ago)

Author:

azaozz

Message:

REST API: Remove trailing slashes when preloading requests and add unit tests for it.

Props antonvlasenko.
Fixes #51636.

Location:

trunk

Files:

• src/wp-includes/rest-api.php (modified) (1 diff)
• tests/phpunit/tests/rest-api.php (modified) (1 diff)

trunk/src/wp-includes/rest-api.php

@@ -2819 +2819 @@
     }
 
+    $path = untrailingslashit( $path );
+    if ( empty( $path ) ) {
+        $path = '/';
+    }
+
     $path_parts = parse_url( $path );
     if ( false === $path_parts ) {

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

@@ -950 +950 @@
 
         $this->assertSame( array_keys( $preload_data ), array( '/wp/v2/types', 'OPTIONS' ) );
+        $this->assertArrayHasKey( '/wp/v2/media', $preload_data['OPTIONS'] );
+
+        $GLOBALS['wp_rest_server'] = $rest_server;
+    }
+
+    /**
+     * @ticket 51636
+     */
+    function test_rest_preload_api_request_removes_trailing_slashes() {
+        $rest_server               = $GLOBALS['wp_rest_server'];
+        $GLOBALS['wp_rest_server'] = null;
+
+        $preload_paths = array(
+            '/wp/v2/types//',
+            array( '/wp/v2/media///', 'OPTIONS' ),
+            '////',
+        );
+
+        $preload_data = array_reduce(
+            $preload_paths,
+            'rest_preload_api_request',
+            array()
+        );
+
+        $this->assertSame( array_keys( $preload_data ), array( '/wp/v2/types', 'OPTIONS', '/' ) );
         $this->assertArrayHasKey( '/wp/v2/media', $preload_data['OPTIONS'] );