feat(deps): support justinrainbow/json-schema 6.x

composer.json

@@ -22,7 +22,7 @@
   "require": {
     "php": "^8.2",
     "guzzlehttp/guzzle": "^7.8",
-    "justinrainbow/json-schema": "^5.2",
+    "justinrainbow/json-schema": "^5.2 || ^6.0",
     "caseyamcl/guzzle_retry_middleware": "^2.9"
   },
   "require-dev": {

phpstan.neon

@@ -9,4 +9,8 @@ parameters:
   - identifier: match.unhandled
     path: src/Generated/V2/Schemas/Marketplace/*.php
   - identifier: instanceof.alwaysTrue
-    path: src/Generated
+    path: src/Generated
+  # justinrainbow/json-schema 5.x has incorrect doc-comments on the Factory constructor
+  - identifier: argument.type
+    path: src/Validator/Validator.php
+    reportUnmatched: false

src/Validator/SchemaStorage.php

@@ -4,19 +4,27 @@
 
 namespace Mittwald\ApiClient\Validator;
 
+use JsonSchema\Constraints\BaseConstraint;
 use JsonSchema\SchemaStorageInterface;
 use stdClass;
 
 class SchemaStorage implements SchemaStorageInterface
 {
     private array $schemas = [];
 
+    /**
+     * @param mixed $schema Schema; may be passed as array, despite the interface docs
+     */
     public function addSchema($id, $schema = null): void
     {
+        if (is_array($schema)) {
+            $schema = BaseConstraint::arrayToObjectRecursive($schema);
+        }
+
         $this->schemas[$id] = $schema;
     }
 
-    public function getSchema($id): object
+    public function getSchema($id): object|bool
     {
         return $this->schemas[$id];
     }

src/Validator/Validator.php

@@ -18,7 +18,7 @@ class Validator extends \JsonSchema\Validator
     public function __construct()
     {
         $schemaStorage = new SchemaStorage();
-        $factory = new Factory($schemaStorage); // @phpstan-ignore argument.type (doc-comments are incorrect)
+        $factory = new Factory($schemaStorage);
 
         parent::__construct($factory);
     }