Changeset 35671

Timestamp:

11/18/2015 06:28:55 PM (10 years ago)

Author:

johnbillion

Message:

Update WP_REST_Response::as_error() to handle the new format error responses introduced in [35653].

Props danielbachhuber
Fixes #34551

Location:

trunk

Files:

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

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

@@ -244 +244 @@
 
         if ( is_array( $this->get_data() ) ) {
-            foreach ( $this->get_data() as $err ) {
-                $error->add( $err['code'], $err['message'], $err['data'] );
+            $data = $this->get_data();
+            $error->add( $data['code'], $data['message'], $data['data'] );
+            if ( ! empty( $data['additional_errors'] ) ) {
+                foreach( $data['additional_errors'] as $err ) {
+                    $error->add( $err['code'], $err['message'], $err['data'] );
+                }
             }
         } else {

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

@@ -283 +283 @@
     }
 
+    public function test_error_to_response_to_error() {
+        $code     = 'wp-api-test-error';
+        $message  = 'Test error message for the API';
+        $code2    = 'wp-api-test-error-2';
+        $message2 = 'Another test message';
+        $error   = new WP_Error( $code, $message, array( 'status' => 400 ) );
+        $error->add( $code2, $message2, array( 'status' => 403 ) );
+
+        $response = $this->server->error_to_response( $error );
+        $this->assertInstanceOf( 'WP_REST_Response', $response );
+
+        $this->assertEquals( 400, $response->get_status() );
+
+        $error = $response->as_error();
+        $this->assertInstanceOf( 'WP_Error', $error );
+        $this->assertEquals( $code, $error->get_error_code() );
+        $this->assertEquals( $message, $error->get_error_message() );
+        $this->assertEquals( $message2, $error->errors[ $code2 ][0] );
+        $this->assertEquals( array( 'status' => 403 ), $error->error_data[ $code2 ] );
+    }
+
     public function test_rest_error() {
         $data = array(