Changeset 62107

Timestamp:

03/24/2026 05:38:12 PM (4 days ago)

Author:

westonruter

Message:

Code Modernization: Fix rest_convert_error_to_response() handling of non-array error data when obtaining status.

While the error data is normally an array, this is not guaranteed. This issue would have been detected by PHPStan rule level 9, since WP_Error::get_all_error_data() returns mixed[].

Developed in ​https://github.com/WordPress/wordpress-develop/pull/11307

Follow-up to r61429.

Props nateallen, desrosj, jorbin, mukesh27, westonruter.
See #63430.
Fixes #64901.

Location:

trunk

Files:

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

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

@@ -3428 +3428 @@
     $status = array_reduce(
         $error->get_all_error_data(),
-        static function ( $status, $error_data ) {
-            return $error_data['status'] ?? $status;
+        /**
+         * @param int   $status     Status.
+         * @param mixed $error_data Error data.
+         */
+        static function ( int $status, $error_data ): int {
+            if ( is_array( $error_data ) && isset( $error_data['status'] ) && is_numeric( $error_data['status'] ) ) {
+                $status = (int) $error_data['status'];
+            }
+            return $status;
         },
         500

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

@@ -591 +591 @@
         $this->assertSame( 'more_data', $response->get_data()['data'] );
         $this->assertSame( array( array( 'status' => 400 ) ), $response->get_data()['additional_data'] );
+    }
+
+    /**
+     * @ticket 64901
+     */
+    public function test_error_to_response_with_stdclass_data() {
+        $error = new WP_Error( 'test', 'test', (object) array( 'status' => 400 ) );
+
+        $response = rest_convert_error_to_response( $error );
+        $this->assertInstanceOf( WP_REST_Response::class, $response );
+
+        // stdClass data should not cause a fatal, status should default to 500.
+        $this->assertSame( 500, $response->get_status() );
+    }
+
+    /**
+     * @ticket 64901
+     */
+    public function test_error_to_response_with_multi_status_non_numeric_status() {
+        $error = new WP_Error( 'test', 'test', array( 'status' => array( 'feeling' => 'happy' ) ) );
+        $error->add_data( array( 'status' => 400 ), 'test' );
+        $error->add_data( array( 'status' => array( 'feeling' => 'bleh' ) ), 'test' );
+
+        $response = rest_convert_error_to_response( $error );
+        $this->assertInstanceOf( WP_REST_Response::class, $response );
+
+        $this->assertSame( 400, $response->get_status() );
     }