Merge pull request #49 from martinhartmann/master

Proper URL decoding on file:/// references

Author: vearutop

src/RemoteRef/BasicFetcher.php

@@ -8,6 +8,6 @@ class BasicFetcher implements RemoteRefProvider
 {
     public function getSchemaData($url)
     {
-        return json_decode(file_get_contents($url));
+        return json_decode(file_get_contents(rawurldecode($url)));
     }
-}
+}

tests/resources/remotes/#special~characters%directory/subSchemas.json

@@ -0,0 +1,19 @@
+{
+    "integer": {
+        "type": "integer"
+    }, 
+    "refToInteger": {
+        "$ref": "#/integer"
+    },
+    "indirectRefToInteger": {
+        "allOf": [
+            {},
+            {
+                "$ref": "#/refToInteger"
+            }
+        ]
+    },
+    "refToExternalInteger": {
+        "$ref": "http://json-schema.org/draft-04/schema#/definitions/positiveIntegerDefault0"
+    }
+}

tests/src/PHPUnit/Ref/FileResolverTest.php

@@ -113,6 +113,22 @@ function testFileReferenceRealpath()
         $schema->in('abc');
     }
 
+    function testFileReferenceRealpathWithSpecialCharacters()
+    {
+        $pathToExternalSchema = realpath(__DIR__ . '/../../../resources/remotes/#special~characters%directory/subSchemas.json');
+        $pathToExternalSchema = str_replace('#special~characters%directory', rawurlencode('#special~characters%directory'), $pathToExternalSchema);
+        $schemaData = json_decode(<<<JSON
+{"\$ref": "file://$pathToExternalSchema#/integer"}
+JSON
+        );
+
+        $schema = Schema::import($schemaData);
+        $schema->in(123);
+
+        $this->setExpectedException(get_class(new InvalidValue()));
+        $schema->in('abc');
+    }
+
     function testFileReferenceNoProtocolScheme()
     {
         $pathToExternalSchema = __DIR__ . '/../../../resources/remotes/subSchemas.json';