Changeset 57659

Timestamp:

02/20/2024 09:08:10 AM (2 years ago)

Author:

swissspidy

Message:

REST API: Pass correct context to embedded items.

Fixes a regression introduced in [57623] where navigation embed items were missing raw property values.

Props mamaduka, swissspidy, youknowriad, timothyblynjacobs.
Fixes #43439.

Location:

trunk

Files:

• src/wp-includes/rest-api/class-wp-rest-server.php (modified) (2 diffs)
• tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php (modified) (1 diff)

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

@@ -744 +744 @@
                                         }
 
+                                        // Embedded resources get passed context=embed.
+                                        if ( empty( $request['context'] ) ) {
+                                                $request['context'] = 'embed';
+                                        }
+
                                         if ( empty( $request['per_page'] ) ) {
                                                 $matched = $this->match_request_to_handler( $request );
@@ -749 +754 @@
                                                         $request['per_page'] = (int) $matched[1]['args']['per_page']['maximum'];
                                                 }
-                                        }
-
-                                        // Embedded resources get passed context=embed.
-                                        if ( empty( $request['context'] ) ) {
-                                                $request['context'] = 'embed';
                                         }
 

trunk/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php

@@ -161 +161 @@
                 $request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
                 $response = rest_get_server()->dispatch( $request );
-                $links    = $response->get_links();
-
-                // Extract the navigation endpoint URL from the response.
-                $embedded_navigation_href = $links['self'][0]['href'];
-                preg_match( '/\?rest_route=(.*)/', $embedded_navigation_href, $matches );
-                $navigation_endpoint = $matches[1];
-
-                // Fetch the "linked" navigation post from the endpoint, with the context parameter set to 'embed' to simulate fetching embedded links.
-                $request = new WP_REST_Request( 'GET', $navigation_endpoint );
-                $request->set_param( 'context', 'embed' );
-                $response = rest_get_server()->dispatch( $request );
-                $data     = $response->get_data();
+                $data     = rest_get_server()->response_to_data( $response, true );
+                $embedded = $data['_embedded']['self'][0];
 
                 // Verify that the additional status field is present.
-                $this->assertArrayHasKey( 'status', $data, 'Response title should contain a "status" field.' );
+                $this->assertArrayHasKey( 'status', $embedded, 'Response title should contain a "status" field.' );
 
                 // Verify that the additional content fields are present.
-                $this->assertArrayHasKey( 'content', $data, 'Response should contain a "content" field.' );
-                $this->assertArrayHasKey( 'raw', $data['content'], 'Response content should contain a "raw" field.' );
-                $this->assertArrayHasKey( 'rendered', $data['content'], 'Response content should contain a "rendered" field.' );
-                $this->assertArrayHasKey( 'block_version', $data['content'], 'Response should contain a "block_version" field.' );
+                $this->assertArrayHasKey( 'content', $embedded, 'Response should contain a "content" field.' );
+                $this->assertArrayHasKey( 'raw', $embedded['content'], 'Response content should contain a "raw" field.' );
+                $this->assertArrayHasKey( 'rendered', $embedded['content'], 'Response content should contain a "rendered" field.' );
+                $this->assertArrayHasKey( 'block_version', $embedded['content'], 'Response should contain a "block_version" field.' );
 
                 // Verify that the additional title.raw field is present.
-                $this->assertArrayHasKey( 'raw', $data['title'], 'Response title should contain a "raw" key.' );
+                $this->assertArrayHasKey( 'raw', $embedded['title'], 'Response title should contain a "raw" key.' );
         }