Merge pull request #95 from Krunch/fix/proper-cast-tolerateStrings

Return properly cast data when using tolerateStrings

Author: vearutop

src/Schema.php

@@ -1116,10 +1116,6 @@ public function process($data, Context $options, $path = '#', $result = null)
             $data = $options->dataPreProcessor->process($data, $this, $import);
         }
 
-        if ($result === null) {
-            $result = $data;
-        }
-
         if ($options->skipValidation) {
             goto skipValidation;
         }
@@ -1154,6 +1150,10 @@ public function process($data, Context $options, $path = '#', $result = null)
 
         skipValidation:
 
+        if ($result === null) {
+            $result = $data;
+        }
+
         if ($this->oneOf !== null) {
             $result = $this->processOneOf($data, $options, $path);
         }

tests/src/PHPUnit/TolerateStringsTest.php

@@ -35,12 +35,20 @@ public function testWithTolerateStrings()
             '2'
         ];
 
+        $expected_data = [
+            'text',
+            10,
+            123.45,
+            true,
+            2
+        ];
+
         $options = new Context();
         $options->tolerateStrings = true;
 
         $schema = Schema::import($json_schema);
 
-        $this->assertSame($data, $schema->in($data, $options));
+        $this->assertSame($expected_data, $schema->in($data, $options));
     }
 
     public function testWithTolerateStringsBadNumber()