Add number coercion cases from ajv matrix

Author: erayd

src/JsonSchema/Constraints/TypeConstraint.php

@@ -263,15 +263,23 @@ protected function toNumber($value)
         if (is_numeric($value)) {
             return $value + 0; // cast to number
         }
+        if (is_bool($value) || is_null($value)) {
+            return (int) $value;
+        }
+        if ($this->getTypeCheck()->isArray($value) && count($value) === 1) {
+            reset($value);
+
+            return $this->toNumber(current($value));
+        }
 
         return $value;
     }
 
     protected function toInteger($value)
     {
         $numberValue = $this->toNumber($value);
-        if ((int) $numberValue == $numberValue) {
-            return (int) $value; // cast to number
+        if (is_numeric($numberValue) && (int) $numberValue == $numberValue) {
+            return (int) $numberValue; // cast to number
         }
 
         return $value;

tests/Constraints/CoerciveTest.php

@@ -55,21 +55,22 @@ public function testValidCoerceCases($input, $schema, $errors = array())
         $validator->validate($value, $schema, $checkMode);
 
         $this->assertTrue(gettype($value->number) == 'double');
+        $this->assertTrue(gettype($value->boolNumber) == 'integer');
+        $this->assertTrue(gettype($value->nullNumber) == 'integer');
+        $this->assertTrue(gettype($value->arrayNumber) == 'double');
         $this->assertTrue(gettype($value->integer) == 'integer');
         $this->assertTrue(gettype($value->negativeInteger) == 'integer');
         $this->assertTrue(gettype($value->boolean) == 'boolean');
 
-        $this->assertTrue($value->number === 1.5);
-        $this->assertTrue($value->integer === 1);
-        $this->assertTrue($value->negativeInteger === -2);
-        $this->assertTrue($value->boolean === true);
-
         $this->assertTrue(gettype($value->multitype1) == 'boolean');
         $this->assertTrue(gettype($value->multitype2) == 'double');
         $this->assertTrue(gettype($value->multitype3) == 'integer');
         $this->assertTrue(gettype($value->multitype4) == 'string');
 
         $this->assertTrue($value->number === 1.5);
+        $this->assertTrue($value->boolNumber === 1);
+        $this->assertTrue($value->nullNumber === 0);
+        $this->assertTrue($value->arrayNumber === 1.5);
         $this->assertTrue($value->integer === 1);
         $this->assertTrue($value->negativeInteger === -2);
         $this->assertTrue($value->boolean === true);
@@ -124,6 +125,9 @@ public function getValidCoerceTests()
                 '{
                   "string":"string test",
                   "number":"1.5",
+                  "boolNumber":true,
+                  "nullNumber":null,
+                  "arrayNumber":["1.5"],
                   "integer":"1",
                   "negativeInteger":"-2",
                   "boolean":"true",
@@ -152,6 +156,9 @@ public function getValidCoerceTests()
                   "properties":{
                     "string":{"type":"string"},
                     "number":{"type":"number"},
+                    "boolNumber":{"type":"number"},
+                    "nullNumber":{"type":"number"},
+                    "arrayNumber":{"type":"number"},
                     "integer":{"type":"integer"},
                     "negativeInteger":{"type":"integer"},
                     "boolean":{"type":"boolean"},
@@ -285,6 +292,18 @@ public function getInvalidCoerceTests()
                   "additionalProperties":false
                 }',
             ),
+            array( // #7
+                '{
+                  "integer":"5f"
+                }',
+                '{
+                  "type":"object",
+                  "properties": {
+                    "integer":{"type":"integer"}
+                  },
+                  "additionalProperties":false
+                }',
+            ),
         );
     }
 }