Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Allow installation of justinrainbow/json-schema:^6.0.0 #1199

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
23 changes: 9 additions & 14 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading