mirror of
git://develop.git.wordpress.org/
synced 2025-03-15 01:19:51 +01:00
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. git-svn-id: https://develop.svn.wordpress.org/trunk@50653 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
0f4d1d674c
commit
19ae5a9809
@ -1926,6 +1926,12 @@ function rest_are_values_equal( $value1, $value2 ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if ( is_int( $value1 ) && is_float( $value2 )
|
||||
|| is_float( $value1 ) && is_int( $value2 )
|
||||
) {
|
||||
return (float) $value1 === (float) $value2;
|
||||
}
|
||||
|
||||
return $value1 === $value2;
|
||||
}
|
||||
|
||||
|
@ -250,6 +250,7 @@ class WP_Test_REST_Schema_Validation extends WP_UnitTestCase {
|
||||
|
||||
/**
|
||||
* @ticket 51911
|
||||
* @ticket 52932
|
||||
*
|
||||
* @dataProvider data_different_types_of_value_and_enum_elements
|
||||
*
|
||||
@ -304,6 +305,14 @@ class WP_Test_REST_Schema_Validation extends WP_UnitTestCase {
|
||||
),
|
||||
true,
|
||||
),
|
||||
array(
|
||||
1,
|
||||
array(
|
||||
'type' => 'integer',
|
||||
'enum' => array( 0.0, 1.0 ),
|
||||
),
|
||||
true,
|
||||
),
|
||||
array(
|
||||
1.0,
|
||||
array(
|
||||
@ -378,6 +387,14 @@ class WP_Test_REST_Schema_Validation extends WP_UnitTestCase {
|
||||
),
|
||||
true,
|
||||
),
|
||||
array(
|
||||
1,
|
||||
array(
|
||||
'type' => 'number',
|
||||
'enum' => array( 0, 1 ),
|
||||
),
|
||||
true,
|
||||
),
|
||||
array(
|
||||
1.0,
|
||||
array(
|
||||
|
Loading…
x
Reference in New Issue
Block a user