better ajv tests compliance

Author: vearutop

src/RefResolver.php

@@ -206,7 +206,7 @@ public function resolveReference($referencePath)
 
 
     /**
-     * @param $data
+     * @param mixed $data
      * @param Context $options
      * @param int $nestingLevel
      * @throws Exception
@@ -229,7 +229,7 @@ public function preProcessReferences($data, Context $options, $nestingLevel = 0)
             ) {
                 $prev = $this->setupResolutionScope($data->{Schema::ID_D4}, $data);
                 /** @noinspection PhpUnusedLocalVariableInspection */
-                $_ = new ScopeExit(function () use ($prev, $options) {
+                $_ = new ScopeExit(function () use ($prev) {
                     $this->setResolutionScope($prev);
                 });
             }
@@ -240,7 +240,7 @@ public function preProcessReferences($data, Context $options, $nestingLevel = 0)
             ) {
                 $prev = $this->setupResolutionScope($data->{Schema::ID}, $data);
                 /** @noinspection PhpUnusedLocalVariableInspection */
-                $_ = new ScopeExit(function () use ($prev, $options) {
+                $_ = new ScopeExit(function () use ($prev) {
                     $this->setResolutionScope($prev);
                 });
             }

src/RemoteRef/Preloaded.php

@@ -11,18 +11,23 @@ class Preloaded implements RemoteRefProvider
 {
     private $storage;
 
-    private $cachePaths = array(
-        'http://json-schema.org/draft-04/schema' => __DIR__ . '/../../spec/json-schema.json',
-        'http://json-schema.org/draft-06/schema' => __DIR__ . '/../../spec/json-schema-draft6.json',
-        'http://json-schema.org/draft-07/schema' => __DIR__ . '/../../spec/json-schema-draft7.json',
-    );
+    private $schemaFiles;
+
+    public function __construct()
+    {
+        $this->schemaFiles = array(
+            'http://json-schema.org/draft-04/schema' => __DIR__ . '/../../spec/json-schema.json',
+            'http://json-schema.org/draft-06/schema' => __DIR__ . '/../../spec/json-schema-draft6.json',
+            'http://json-schema.org/draft-07/schema' => __DIR__ . '/../../spec/json-schema-draft7.json',
+        );
+    }
 
     public function getSchemaData($url)
     {
         if (isset($this->storage[$url])) {
             return $this->storage[$url];
-        } elseif (isset($this->cachePaths[$url])) {
-            $this->storage[$url] = json_decode(file_get_contents($this->cachePaths[$url]));
+        } elseif (isset($this->schemaFiles[$url])) {
+            $this->storage[$url] = json_decode(file_get_contents($this->schemaFiles[$url]));
             return $this->storage[$url];
         }
         return false;
@@ -56,5 +61,11 @@ public function setSchemaData($url, $schemaData)
         return $this;
     }
 
+    public function setSchemaFile($url, $path)
+    {
+        $this->schemaFiles[$url] = $path;
+        return $this;
+    }
+
 
 }

src/Schema.php

@@ -118,7 +118,7 @@ public static function import($data, Context $options = null)
     }
 
     /**
-     * @param $data
+     * @param mixed $data
      * @param Context|null $options
      * @return array|mixed|null|object|\stdClass
      * @throws Exception