Changeset 50656 for branches/5.7/src/wp-includes/rest-api.php

Timestamp:

04/04/2021 07:11:07 PM (3 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.
Merges [50653] to the 5.7 branch.
Fixes #52932.

Location:

branches/5.7

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api.php (modified) (1 diff)

branches/5.7/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;
     }