Changeset 47362

Timestamp:

02/25/2020 03:32:27 PM (6 years ago)

Author:

kadamwhite

Message:

REST API: Correctly infer empty objects passed via query parameters.

Permit passing an empty object as the string "?obj=". The type of the passed empty argument is inferred from the registered schema.

Props TimothyBlynJacobs, steffanhalv, schlessera, dd32.
Fixes #42961.

Location:

trunk

Files:

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

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

@@ -1251 +1251 @@
 
         if ( 'object' === $args['type'] ) {
+                if ( '' === $value ) {
+                        $value = array();
+                }
+
                 if ( $value instanceof stdClass ) {
                         $value = (array) $value;

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

@@ -276 +276 @@
         }
 
+        /**
+         * @ticket 42961
+         */
+        public function test_type_object_accepts_empty_string() {
+                $this->assertEquals( array(), rest_sanitize_value_from_schema( '', array( 'type' => 'object' ) ) );
+        }
+
         public function test_type_unknown() {
                 $schema = array(

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

@@ -289 +289 @@
         }
 
+        /**
+         * @ticket 42961
+         */
+        public function test_type_object_allows_empty_string() {
+                $this->assertTrue( rest_validate_value_from_schema( '', array( 'type' => 'object' ) ) );
+        }
+
         public function test_type_unknown() {
                 $schema = array(