Changeset 50653

Timestamp:

04/04/2021 06:05:10 PM (5 years ago)

Author:

SergeyBiryukov

Message:

REST API: Correct enum validation for numeric values.

When validating enum values as integer or number, consider a number with a zero fractional part to be equivalent to an integer of the same value.

In rest_are_values_equal(), when comparing two values of type int or float (in any combination), first cast both of them to float and then compare.

This matches some test cases from the official JSON Schema test suite.

Follow-up to [50010].

Props yakimun, stefanjoebstl, TimothyBlynJacobs, rachelbaker.
Fixes #52932.

Location:

trunk

Files:

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

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

@@ -1925 +1925 @@
 
                 return true;
+        }
+
+        if ( is_int( $value1 ) && is_float( $value2 )
+                || is_float( $value1 ) && is_int( $value2 )
+        ) {
+                return (float) $value1 === (float) $value2;
         }
 

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

@@ -251 +251 @@
         /**
          * @ticket 51911
+         * @ticket 52932
          *
          * @dataProvider data_different_types_of_value_and_enum_elements
@@ -306 +307 @@
                         ),
                         array(
+                                1,
+                                array(
+                                        'type' => 'integer',
+                                        'enum' => array( 0.0, 1.0 ),
+                                ),
+                                true,
+                        ),
+                        array(
                                 1.0,
                                 array(
@@ -376 +385 @@
                                         'type' => 'number',
                                         'enum' => array( 0.0, 1.0 ),
+                                ),
+                                true,
+                        ),
+                        array(
+                                1,
+                                array(
+                                        'type' => 'number',
+                                        'enum' => array( 0, 1 ),
                                 ),
                                 true,