Changeset 39896

Timestamp:

01/13/2017 04:37:03 AM (8 years ago)

Author:

SergeyBiryukov

Message:

REST API: Improve error messages for number relational validation.

Props jblz.
Fixes #39054.

Location:

trunk

Files:

• src/wp-includes/rest-api.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-categories-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-schema-validation.php (modified) (2 diffs)

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

@@ -1069 +1069 @@
             if ( ! empty( $args['exclusiveMinimum'] ) && $value <= $args['minimum'] ) {
                 /* translators: 1: parameter, 2: minimum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (exclusive)' ), $param, $args['minimum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d' ), $param, $args['minimum'] ) );
             } elseif ( empty( $args['exclusiveMinimum'] ) && $value < $args['minimum'] ) {
                 /* translators: 1: parameter, 2: minimum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than %2$d (inclusive)' ), $param, $args['minimum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be greater than or equal to %2$d' ), $param, $args['minimum'] ) );
             }
         } elseif ( isset( $args['maximum'] ) && ! isset( $args['minimum'] ) ) {
             if ( ! empty( $args['exclusiveMaximum'] ) && $value >= $args['maximum'] ) {
                 /* translators: 1: parameter, 2: maximum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (exclusive)' ), $param, $args['maximum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d' ), $param, $args['maximum'] ) );
             } elseif ( empty( $args['exclusiveMaximum'] ) && $value > $args['maximum'] ) {
                 /* translators: 1: parameter, 2: maximum number */
-                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than %2$d (inclusive)' ), $param, $args['maximum'] ) );
+                return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s must be less than or equal to %2$d' ), $param, $args['maximum'] ) );
             }
         } elseif ( isset( $args['maximum'] ) && isset( $args['minimum'] ) ) {

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

@@ -187 +187 @@
         $data = $response->get_data();
         $first_error = array_shift( $data['data']['params'] );
-        $this->assertContains( 'page must be greater than 1 (inclusive)', $first_error );
+        $this->assertContains( 'page must be greater than or equal to 1', $first_error );
     }
 

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

@@ -20 +20 @@
         $this->assertTrue( rest_validate_value_from_schema( 1, $schema ) );
         $this->assertTrue( rest_validate_value_from_schema( 2, $schema ) );
+        $this->assertWPError( rest_validate_value_from_schema( 0.9, $schema ) );
         $this->assertWPError( rest_validate_value_from_schema( 3, $schema ) );
         $this->assertWPError( rest_validate_value_from_schema( true, $schema ) );
@@ -32 +33 @@
         $this->assertTrue( rest_validate_value_from_schema( 1, $schema ) );
         $this->assertTrue( rest_validate_value_from_schema( 2, $schema ) );
+        $this->assertWPError( rest_validate_value_from_schema( 0, $schema ) );
         $this->assertWPError( rest_validate_value_from_schema( 3, $schema ) );
         $this->assertWPError( rest_validate_value_from_schema( 1.1, $schema ) );