Changeset 49246 for trunk/tests/phpunit/tests/rest-api/rest-controller.php

Timestamp:

10/20/2020 06:22:39 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

REST API: Add support for the oneOf and anyOf keywords.

This allows for REST API routes to define more complex validation requirements as JSON Schema instead of procedural validation.

The error code returned from rest_validate_value_from_schema for invalid parameter types has been changed from the generic rest_invalid_param to the more specific rest_invalid_type.

Props yakimun, johnbillion, TimothyBlynJacobs.
Fixes #51025.

File:

• trunk/tests/phpunit/tests/rest-api/rest-controller.php (modified) (4 diffs)

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

@@ -67 +67 @@
 
         $this->assertErrorResponse(
-            'rest_invalid_param',
+            'rest_invalid_type',
             rest_validate_request_arg( 'abc', $this->request, 'someinteger' )
         );
@@ -141 +141 @@
 
         $this->assertErrorResponse(
-            'rest_invalid_param',
+            'rest_invalid_type',
             rest_validate_request_arg( '123', $this->request, 'someboolean' )
         );
@@ -153 +153 @@
 
         $this->assertErrorResponse(
-            'rest_invalid_param',
+            'rest_invalid_type',
             rest_validate_request_arg( array( 'foo' => 'bar' ), $this->request, 'somestring' )
         );
@@ -298 +298 @@
             'minProperties',
             'maxProperties',
+            'anyOf',
+            'oneOf',
         );
         foreach ( $object_properties as $property ) {