From 0f68cea5ef8dd0bb3ba6e81f87ecbfeaf4a15278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 4 Dec 2024 17:34:08 +0100
Subject: [PATCH] Enhancement: Allow installation of
 justinrainbow/json-schema:^6.0.0

---
 .github/workflows/integrate.yaml |  4 ++++
 CHANGELOG.md                     |  5 +++++
 composer.json                    |  2 +-
 composer.lock                    | 23 +++++++++--------------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 81b6af50..0b56218b 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -484,6 +484,10 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Remove incompatible dependencies with composer"
+        if: "matrix.dependencies != 'locked'"
+        run: "composer remove infection/infection --ansi --dev --no-interaction --no-progress"
+
       - name: "Remove platform configuration with composer"
         if: "matrix.dependencies != 'locked'"
         run: "composer config platform.php --ansi --unset"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e236b167..72d36a8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`4.7.0...main`][4.7.0...main].
 
+### Changed
+
+- Allowed installation of `justinrainbow/json-schema:^6.0.0` ([#1199]), by [@localheinz]
+
 ## [`4.7.0`][4.7.0]
 
 For a full diff see [`4.6.0...4.7.0`][4.6.0...4.7.0].
@@ -720,6 +724,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
 [#1079]: https://github.com/ergebnis/json-normalizer/pull/1079
 [#1171]: https://github.com/ergebnis/json-normalizer/pull/1171
 [#1195]: https://github.com/ergebnis/json-normalizer/pull/1195
+[#1199]: https://github.com/ergebnis/json-normalizer/pull/1199
 
 [@alexis-saransig-lullabot]: https://github.com/alexis-saransig-lullabot
 [@BackEndTea]: https://github.com/BackEndTea
diff --git a/composer.json b/composer.json
index 7459a612..623bd5d2 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     "ergebnis/json-pointer": "^3.4.0",
     "ergebnis/json-printer": "^3.5.0",
     "ergebnis/json-schema-validator": "^4.2.0",
-    "justinrainbow/json-schema": "^5.2.12"
+    "justinrainbow/json-schema": "^5.2.12 || ^6.0.0"
   },
   "require-dev": {
     "composer/semver": "^3.4.3",
diff --git a/composer.lock b/composer.lock
index 26e926d7..6588f326 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9213f89a26b5d91d54889229bb8df252",
+    "content-hash": "49ee6516bda25339d6752bd9e904d1b1",
     "packages": [
         {
             "name": "ergebnis/json",
@@ -271,20 +271,20 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "v5.2.13",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+                "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
-                "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+                "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
@@ -295,11 +295,6 @@
                 "bin/validate-json"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "JsonSchema\\": "src/JsonSchema/"
@@ -334,10 +329,10 @@
                 "schema"
             ],
             "support": {
-                "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+                "issues": "https://github.com/jsonrainbow/json-schema/issues",
+                "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
             },
-            "time": "2023-09-26T02:20:38+00:00"
+            "time": "2024-07-06T21:00:26+00:00"
         }
     ],
     "packages-dev": [