Skip to content

Commit

Permalink
Merge pull request #1234 from ergebnis/fix/conflict
Browse files Browse the repository at this point in the history
Fix: Prevent installation of `symfony/console:^7.0.0`
  • Loading branch information
localheinz committed Dec 5, 2023
2 parents bf8aa43 + f763a8b commit af7de27
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ For a full diff see [`2.39.0...main`][2.39.0...main].

- Updated `schema.json` ([#1204]), by [@ergebnis-bot]

### Fixed

- Prevented installation of `symfony/console:^7.0.0` ([#1234]), by [@localheinz]

## [`2.39.0`][2.39.0]

For a full diff see [`2.38.0...2.39.0`][2.38.0...2.39.0].
Expand Down Expand Up @@ -1165,6 +1169,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
[#1192]: https://github.com/ergebnis/composer-normalize/pull/1192
[#1195]: https://github.com/ergebnis/composer-normalize/pull/1195
[#1204]: https://github.com/ergebnis/composer-normalize/pull/1204
[#1234]: https://github.com/ergebnis/composer-normalize/pull/1234

[@core23]: https://github.com/core23
[@dependabot]: https://github.com/dependabot
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
"symfony/filesystem": "^6.4.0",
"vimeo/psalm": "^5.17.0"
},
"conflict": {
"symfony/console": "^7.0.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

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

0 comments on commit af7de27

Please sign in to comment.