Add array coercion cases from ajv matrix

erayd · Mar 13, 2017 · 867f8a5 · 867f8a5
1 parent 79b5881
commit 867f8a5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 8 deletions.
diff --git a/src/JsonSchema/Constraints/TypeConstraint.php b/src/JsonSchema/Constraints/TypeConstraint.php
@@ -185,6 +185,10 @@ protected function validateType(&$value, $type, $coerce = false)
         }
 
         if ('array' === $type) {
+            if ($coerce) {
+                $value = $this->toArray($value);
+            }
+
             return $this->getTypeCheck()->isArray($value);
         }
 
@@ -271,4 +275,20 @@ protected function toInteger($value)
 
         return $value;
     }
+
+    /**
+     * Converts a value to an array containing that value
+     *
+     * @param mixed $value
+     *
+     * @return array
+     */
+    protected function toArray($value)
+    {
+        if (is_scalar($value) || is_null($value)) {
+            return array($value);
+        }
+
+        return $value;
+    }
 }
diff --git a/tests/Constraints/CoerciveTest.php b/tests/Constraints/CoerciveTest.php
@@ -129,6 +129,8 @@ public function getValidCoerceTests()
                   "boolean":"true",
                   "object":{},
                   "array":[],
+                  "nullArray":null,
+                  "stringArray":"string",
                   "null":null,
                   "any": "string",
                   "allOf": "1",
@@ -155,6 +157,8 @@ public function getValidCoerceTests()
                     "boolean":{"type":"boolean"},
                     "object":{"type":"object"},
                     "array":{"type":"array"},
+                    "nullArray":{"type":"array"},
+                    "stringArray":{"type":"array"},
                     "null":{"type":"null"},
                     "any": {"type":"any"},
                     "allOf" : {"allOf":[{
@@ -195,7 +199,7 @@ public function getValidCoerceTests()
     public function getInvalidCoerceTests()
     {
         return array(
-            array(
+            array( // #0
                 '{
                   "string":null
                 }',
@@ -207,7 +211,7 @@ public function getInvalidCoerceTests()
                   "additionalProperties":false
                 }',
             ),
-            array(
+            array( // #1
                 '{
                   "number":"five"
                 }',
@@ -219,7 +223,7 @@ public function getInvalidCoerceTests()
                   "additionalProperties":false
                 }',
             ),
-            array(
+            array( // #2
                 '{
                   "integer":"5.2"
                 }',
@@ -231,7 +235,7 @@ public function getInvalidCoerceTests()
                   "additionalProperties":false
                 }',
             ),
-            array(
+            array( // #3
                 '{
                   "boolean":"0"
                 }',
@@ -243,7 +247,7 @@ public function getInvalidCoerceTests()
                   "additionalProperties":false
                 }',
             ),
-            array(
+            array( // #4
                 '{
                   "object":null
                 }',
@@ -255,9 +259,11 @@ public function getInvalidCoerceTests()
                   "additionalProperties":false
                 }',
             ),
-            array(
+            array( // #5
                 '{
-                  "array":null
+                    "array":{
+                        "string":"string"
+                    }
                 }',
                 '{
                   "type":"object",
@@ -267,7 +273,7 @@ public function getInvalidCoerceTests()
                   "additionalProperties":false
                 }',
             ),
-            array(
+            array( // #6
                 '{
                   "null":1
                 }',