Changeset 50047

Timestamp:

01/28/2021 12:52:01 AM (4 years ago)

Author:

whyisjake

Message:

REST API: Only include the controller's own taxonomy in it's schema.

Previously, all taxonomies were incorrectly exposed as possible values.

This commit brings the changes from [49922] to the 5.6 branch.

Props johnbillion, TimothyBlynJacobs.

Fixes #51940.

Location:

branches/5.6

Files:

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

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

@@ -966 +966 @@
                     'description' => __( 'Type attribution for the term.' ),
                     'type'        => 'string',
-                    'enum'        => array_keys( get_taxonomies() ),
+                    'enum'        => array( $this->taxonomy ),
                     'context'     => array( 'view', 'embed', 'edit' ),
                     'readonly'    => true,

branches/5.6/tests/phpunit/tests/rest-api/rest-categories-controller.php

@@ -1141 +1141 @@
         $this->assertArrayHasKey( 'slug', $properties );
         $this->assertArrayHasKey( 'taxonomy', $properties );
-        $this->assertSame( array_keys( get_taxonomies() ), $properties['taxonomy']['enum'] );
+        $this->assertSame( array( 'category' ), $properties['taxonomy']['enum'] );
     }
 

branches/5.6/tests/phpunit/tests/rest-api/rest-tags-controller.php

@@ -1234 +1234 @@
         $this->assertArrayHasKey( 'slug', $properties );
         $this->assertArrayHasKey( 'taxonomy', $properties );
-        $this->assertSame( array_keys( get_taxonomies() ), $properties['taxonomy']['enum'] );
+        $this->assertSame( array( 'post_tag' ), $properties['taxonomy']['enum'] );
     }