Changeset 48883 for branches/5.5

Timestamp:

08/27/2020 02:43:40 PM (4 years ago)

Author:

SergeyBiryukov

Message:

REST API: Fix multi-type schemas with integer fields.

In [48306] support for multi-typed schemas was improved to first detect the data type of the value before applying further validation. The integer data type was detected using the new rest_is_integer function. This function used logic, however, that assumed that the value had already passed an is_numeric check. This meant that if integer and string were both acceptable types, the value would always be considered an integer causing the later accurate type validation to fail.

This commit fixes the rest_is_integer logic to include an is_numeric check.

Props rtagliento, TimothyBlynJacobs.
Merges [48881] to the 5.5 branch.
Fixes #51146.

Location:

branches/5.5

Files:

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

branches/5.5/src/wp-includes/rest-api.php

@@ -1316 +1316 @@
  */
 function rest_is_integer( $maybe_integer ) {
-    return round( floatval( $maybe_integer ) ) === floatval( $maybe_integer );
+    return is_numeric( $maybe_integer ) && round( floatval( $maybe_integer ) ) === floatval( $maybe_integer );
 }
 

branches/5.5/tests/phpunit/tests/rest-api.php

@@ -1920 +1920 @@
 
     /**
+     * @ticket 51146
+     *
+     * @dataProvider _dp_rest_is_integer
+     *
+     * @param bool  $expected Expected result of the check.
+     * @param mixed $value    The value to check.
+     */
+    public function test_rest_is_integer( $expected, $value ) {
+        $is_integer = rest_is_integer( $value );
+
+        if ( $expected ) {
+            $this->assertTrue( $is_integer );
+        } else {
+            $this->assertFalse( $is_integer );
+        }
+    }
+
+    public function _dp_rest_is_integer() {
+        return array(
+            array(
+                true,
+                1,
+            ),
+            array(
+                true,
+                '1',
+            ),
+            array(
+                true,
+                0,
+            ),
+            array(
+                true,
+                -1,
+            ),
+            array(
+                true,
+                '05',
+            ),
+            array(
+                false,
+                'garbage',
+            ),
+            array(
+                false,
+                5.5,
+            ),
+            array(
+                false,
+                '5.5',
+            ),
+            array(
+                false,
+                array(),
+            ),
+            array(
+                false,
+                true,
+            ),
+        );
+    }
+
+    /**
      * @ticket 50300
      *
@@ -2019 +2082 @@
                 array( 'array', 'string' ),
             ),
+            array(
+                'string',
+                'hello',
+                array( 'integer', 'string' ),
+            ),
         );
     }

branches/5.5/tests/phpunit/tests/rest-api/rest-schema-validation.php

@@ -1041 +1041 @@
         $this->assertTrue( rest_validate_value_from_schema( $data, $schema ) );
     }
+
+    /**
+     * @ticket 50300
+     */
+    public function test_string_or_integer() {
+        $schema = array(
+            'type' => array( 'integer', 'string' ),
+        );
+
+        $this->assertTrue( rest_validate_value_from_schema( 'garbage', $schema ) );
+        $this->assertTrue( rest_validate_value_from_schema( 15, $schema ) );
+        $this->assertTrue( rest_validate_value_from_schema( '15', $schema ) );
+        $this->assertTrue( rest_validate_value_from_schema( '15.5', $schema ) );
+        $this->assertWPError( rest_validate_value_from_schema( 15.5, $schema ) );
+    }
+
 }