Don't coerce already-valid types (fixes jsonrainbow#379)

Author: erayd

src/JsonSchema/Constraints/TypeConstraint.php

@@ -44,16 +44,23 @@ public function check(&$value = null, $schema = null, JsonPointer $path = null,
     {
         $type = isset($schema->type) ? $schema->type : null;
         $isValid = false;
+        $coerce = $this->factory->getConfig(self::CHECK_MODE_COERCE_TYPES);
         $wording = array();
 
         if (is_array($type)) {
-            $this->validateTypesArray($value, $type, $wording, $isValid, $path);
+            $this->validateTypesArray($value, $type, $wording, $isValid, $path, false);
+            if (!$isValid && $coerce) {
+                $this->validateTypesArray($value, $type, $wording, $isValid, $path, true);
+            }
         } elseif (is_object($type)) {
             $this->checkUndefined($value, $type, $path);
 
             return;
         } else {
-            $isValid = $this->validateType($value, $type);
+            $isValid = $this->validateType($value, $type, false);
+            if (!$isValid && $coerce) {
+                $isValid = $this->validateType($value, $type, true);
+            }
         }
 
         if ($isValid === false) {
@@ -79,7 +86,7 @@ public function check(&$value = null, $schema = null, JsonPointer $path = null,
      * @param bool  $isValid           The current validation value
      * @param $path
      */
-    protected function validateTypesArray(&$value, array $type, &$validTypesWording, &$isValid, $path)
+    protected function validateTypesArray(&$value, array $type, &$validTypesWording, &$isValid, $path, $coerce = false)
     {
         foreach ($type as $tp) {
             // already valid, so no need to waste cycles looping over everything
@@ -103,7 +110,7 @@ protected function validateTypesArray(&$value, array $type, &$validTypesWording,
                 $this->validateTypeNameWording($tp);
                 $validTypesWording[] = self::$wording[$tp];
                 if (!$isValid) {
-                    $isValid = $this->validateType($value, $tp);
+                    $isValid = $this->validateType($value, $tp, $coerce);
                 }
             }
         }
@@ -162,7 +169,7 @@ protected function validateTypeNameWording($type)
      *
      * @return bool
      */
-    protected function validateType(&$value, $type)
+    protected function validateType(&$value, $type, $coerce = false)
     {
         //mostly the case for inline schema
         if (!$type) {
@@ -181,8 +188,6 @@ protected function validateType(&$value, $type)
             return $this->getTypeCheck()->isArray($value);
         }
 
-        $coerce = $this->factory->getConfig(Constraint::CHECK_MODE_COERCE_TYPES);
-
         if ('integer' === $type) {
             if ($coerce) {
                 $value = $this->toInteger($value);

tests/Constraints/CoerciveTest.php

@@ -67,6 +67,7 @@ public function testValidCoerceCases($input, $schema, $errors = array())
         $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->integer === 1);
@@ -134,6 +135,7 @@ public function getValidCoerceTests()
                   "multitype1": "false",
                   "multitype2": "1.2",
                   "multitype3": "7",
+                  "multitype4": "45",
                   "arrayOfIntegers":["-1","0","1"],
                   "tupleTyping":["1","2.2","true"],
                   "any1": 2.6,
@@ -163,6 +165,7 @@ public function getValidCoerceTests()
                     "multitype1": {"type":["boolean","integer","number"]},
                     "multitype2": {"type":["boolean","integer","number"]},
                     "multitype3": {"type":["boolean","integer","number"]},
+                    "multitype4": {"type":["boolean","integer","string"]},
                      "arrayOfIntegers":{
                         "items":{
                             "type":"integer"