Merge pull request #265 from mirfilip/feature/upgrade-json-schema-test-sute-to-1.2.0

Bump json-schema/JSON-Schema-Test-Suite to 1.2.0 + some tests improvements

Author: bighappyface

composer.json

@@ -28,27 +28,27 @@
         "type": "package",
         "package": {
             "name": "json-schema/JSON-Schema-Test-Suite",
-            "version": "1.1.2",
+            "version": "1.2.0",
             "source": {
                 "url": "https://github.com/json-schema/JSON-Schema-Test-Suite",
                 "type": "git",
-                "reference": "1.1.2"
+                "reference": "1.2.0"
             }
         }
     }],
     "require": {
         "php": ">=5.3.3"
     },
     "require-dev": {
-        "json-schema/JSON-Schema-Test-Suite": "1.1.2",
+        "json-schema/JSON-Schema-Test-Suite": "1.2.0",
         "phpunit/phpunit": "^4.8.22",
         "phpdocumentor/phpdocumentor": "~2"
     },
     "autoload": {
         "psr-4": { "JsonSchema\\": "src/JsonSchema/" }
     },
     "autoload-dev": {
-        "psr-4": { "JsonSchema\\Tests\\": "tests/JsonSchema/Tests/" }
+        "psr-4": { "JsonSchema\\Tests\\": "tests/" }
     },
     "bin": ["bin/validate-json"],
     "extra": {

tests/JsonSchema/Tests/Constraints/AdditionalPropertiesTest.php renamed to tests/Constraints/AdditionalPropertiesTest.php

@@ -79,7 +79,7 @@ abstract public function getInvalidTests();
      */
     private function resolveSchema($schema)
     {
-        $relativeTestsRoot = realpath(__DIR__ . '/../../../../vendor/json-schema/JSON-Schema-Test-Suite/remotes');
+        $relativeTestsRoot = realpath(__DIR__ . '/../../vendor/json-schema/JSON-Schema-Test-Suite/remotes');
 
         $jsonSchemaDraft03 = $this->getJsonSchemaDraft03();
         $jsonSchemaDraft04 = $this->getJsonSchemaDraft04();