Merge pull request #1198 from tacman/patch-1

allow jsonrainbow / json-schema version 6

.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"

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` ([#1198]), by [@tacman]
+
 ## [`4.7.0`][4.7.0]
 
 For a full diff see [`4.6.0...4.7.0`][4.6.0...4.7.0].
@@ -720,10 +724,12 @@ 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
+[#1198]: https://github.com/ergebnis/json-normalizer/pull/1198
 
 [@alexis-saransig-lullabot]: https://github.com/alexis-saransig-lullabot
 [@BackEndTea]: https://github.com/BackEndTea
 [@dependabot]: https://github.com/dependabot
 [@ergebnis]: https://github.com/ergebnis
 [@fredden]: https://github.com/fredden
 [@localheinz]: https://github.com/localheinz
+[@tacman]: https://github.com/tacman

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",