Changeset 48807

Timestamp:

08/17/2020 01:40:59 AM (4 years ago)

Author:

SergeyBiryukov

Message:

REST API: Add uniqueItems as a permitted endpoint argument JSON Schema keyword.

Support for the uniqueItems keyword was added in [48357], but wasn't included in the list of permitted keywords for WP_REST_Controller::get_endpoint_args_for_item_schema(). This prevented the keyword from being automatically supported if specified in a controller's item schema.

Props TimothyBlynJacobs.
Merges [48796] to the 5.5 branch.
Fixes #51021.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-test-controller.php (modified) (1 diff)

branches/5.5/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php

@@ -646 +646 @@
             'minItems',
             'maxItems',
+            'uniqueItems',
         );
 

branches/5.5/tests/phpunit/tests/rest-api/rest-controller.php

@@ -266 +266 @@
         $this->assertArrayHasKey( 'items', $args['somearray'] );
 
-        foreach ( array( 'minItems', 'maxItems' ) as $property ) {
+        foreach ( array( 'minItems', 'maxItems', 'uniqueItems' ) as $property ) {
             $this->assertArrayHasKey( $property, $args['somearray'] );
         }

branches/5.5/tests/phpunit/tests/rest-api/rest-test-controller.php

@@ -102 +102 @@
                 ),
                 'somearray'      => array(
-                    'type'     => 'array',
-                    'items'    => array(
+                    'type'        => 'array',
+                    'items'       => array(
                         'type' => 'string',
                     ),
-                    'minItems' => 1,
-                    'maxItems' => 10,
-                    'context'  => array( 'view' ),
+                    'minItems'    => 1,
+                    'maxItems'    => 10,
+                    'uniqueItems' => true,
+                    'context'     => array( 'view' ),
                 ),
                 'someobject'     => array(