refactor: resolve PHPStan errors

Author: DannyvdSluijs

src/JsonSchema/Constraints/Factory.php

@@ -50,6 +50,8 @@ class Factory
      */
     protected $errorContext = Validator::ERROR_DOCUMENT_VALIDATION;
 
+    private $defaultDialect = 'http://json-schema.org/draft-06/schema#';
+
     /**
      * @var array
      */
@@ -215,4 +217,14 @@ public function setErrorContext(int $errorContext): void
     {
         $this->errorContext = $errorContext;
     }
+
+    public function getDefaultDialect(): string
+    {
+        return $this->defaultDialect;
+    }
+
+    public function setDefaultDialect(string $defaultDialect): void
+    {
+        $this->defaultDialect = $defaultDialect;
+    }
 }

src/JsonSchema/Entity/ErrorBag.php

@@ -12,10 +12,10 @@
 
 /**
  * @phpstan-type Error array{
- *     property: string,
- *     pointer: string,
- *     message: string,
- *     constraint: array{name: string, params: array<string, mixed>},
+ *     "property": string,
+ *     "pointer": string,
+ *     "message": string,
+ *     "constraint": array{"name": string, "params": array<string, mixed>},
  *     "context": int-mask-of<Validator::ERROR_*>
  * }
  * @phpstan-type ErrorList list<Error>
@@ -91,9 +91,7 @@ public function addErrors(array $errors): void
         $this->errors = array_merge($this->errors, $errors);
         $errorMask = &$this->errorMask;
         array_walk($errors, static function ($error) use (&$errorMask) {
-            if (isset($error['context'])) {
-                $errorMask |= $error['context'];
-            }
+            $errorMask |= $error['context'];
         });
     }
 

src/JsonSchema/Validator.php

@@ -79,8 +79,13 @@ public function validate(&$value, $schema = null, ?int $checkMode = null): int
         }
 
         if ($this->factory->getConfig(Constraint::CHECK_MODE_STRICT)) {
+            $dialect = $this->factory->getDefaultDialect();
+            if (property_exists($schema, '$schema')) {
+                $dialect = $schema->{'$schema'};
+            }
+
             $validator = $this->factory->createInstanceFor(
-                $this->schemaUriToConstraintName($schema->{'$schema'})
+                $this->schemaUriToConstraintName($dialect)
             );
         }