Revert incorrect enum handling for arrays

danielbachhuber · danielbachhuber · commit 9fc824852c44 · 2016-02-01T09:10:19.000-08:00
See https://github.com/WP-API/WP-API/pull/2184/files#r51446020
diff --git a/lib/endpoints/class-wp-rest-users-controller.php b/lib/endpoints/class-wp-rest-users-controller.php
@@ -752,7 +752,6 @@ public function get_item_schema() {
 					'description' => __( 'Roles assigned to the resource.' ),
 					'type'        => 'array',
 					'context'     => array( 'edit' ),
-					'enum'        => array_keys( $wp_roles->role_objects ),
 				),
 				'capabilities'    => array(
 					'description' => __( 'All capabilities assigned to the resource.' ),
diff --git a/plugin.php b/plugin.php
@@ -292,9 +292,6 @@ function rest_validate_request_arg( $value, $request, $param ) {
 			if ( 'string' === $args['type'] && ! in_array( $value, $args['enum'] ) ) {
 				return new WP_Error( 'rest_invalid_param', sprintf( __( '%s is not one of %s' ), $param, implode( ', ', $args['enum'] ) ) );
 			}
-			if ( 'array' === $args['type'] && array_diff( $value, $args['enum'] ) ) {
-				return new WP_Error( 'rest_invalid_param', sprintf( __( '%s includes a value not in %s' ), $param, implode( ', ', $args['enum'] ) ) );
-			}
 		}
 
 		if ( 'integer' === $args['type'] && ! is_numeric( $value ) ) {
diff --git a/tests/test-rest-users-controller.php b/tests/test-rest-users-controller.php
@@ -567,7 +567,7 @@ public function test_create_user_invalid_role() {
 		$request->set_body_params( $params );
 		$response = $this->server->dispatch( $request );
 
-		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+		$this->assertErrorResponse( 'rest_user_invalid_role', $response, 400 );
 	}
 
 	public function test_update_item() {
@@ -772,7 +772,7 @@ public function test_update_user_role_invalid_role() {
 		$request->set_param( 'roles', array( 'BeSharp' ) );
 		$response = $this->server->dispatch( $request );
 
-		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+		$this->assertErrorResponse( 'rest_user_invalid_role', $response, 400 );
 
 		$user = get_userdata( $this->editor );
 		$this->assertArrayHasKey( 'editor', $user->caps );

Original file line number	Diff line number	Diff line change
`@@ -292,9 +292,6 @@ function rest_validate_request_arg( $value, $request, $param ) {`
`292`	`292`	`if ( 'string' === $args['type'] && ! in_array( $value, $args['enum'] ) ) {`
`293`	`293`	`return new WP_Error( 'rest_invalid_param', sprintf( __( '%s is not one of %s' ), $param, implode( ', ', $args['enum'] ) ) );`
`294`	`294`	`}`
`295`		`- if ( 'array' === $args['type'] && array_diff( $value, $args['enum'] ) ) {`
`296`		`- return new WP_Error( 'rest_invalid_param', sprintf( __( '%s includes a value not in %s' ), $param, implode( ', ', $args['enum'] ) ) );`
`297`		`- }`
`298`	`295`	`}`
`299`	`296`
`300`	`297`	`if ( 'integer' === $args['type'] && ! is_numeric( $value ) ) {`