Skip to content

Commit

Permalink
Merge pull request #1299 from ergebnis/feature/dbal
Browse files Browse the repository at this point in the history
Enhancement: Allow installation of `doctrine/dbal:^4.0.0`
  • Loading branch information
localheinz committed Feb 7, 2024
2 parents 1584a4f + 99308d3 commit 51b5832
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,7 @@ For a full diff see [`1.6.0...main`][1.6.0...main].

- Allowed installation of `doctrine/orm:^3.0.0` ([#1293]), by [@localheinz]
- Required `doctrine/orm:^2.14.0` ([#1298]), by [@localheinz]
- Allowed installation of `doctrine/dbal:^4.0.0` ([#1299]), by [@localheinz]

## [`1.6.0`][1.6.0]

Expand Down Expand Up @@ -362,6 +363,7 @@ For a full diff see [`fa9c564...0.1.0`][fa9c564...0.1.0].
[#1234]: https://github.com/ergebnis/factory-bot/pull/1234
[#1293]: https://github.com/ergebnis/factory-bot/pull/1293
[#1298]: https://github.com/ergebnis/factory-bot/pull/1298
[#1299]: https://github.com/ergebnis/factory-bot/pull/1299

[@abenerd]: https://github.com/abenerd
[@localheinz]: https://github.com/localheinz
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -26,7 +26,7 @@
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"doctrine/collections": "^1.6.5 || ^2.0.0",
"doctrine/dbal": "^2.12.0 || ^3.0.0",
"doctrine/dbal": "^2.12.0 || ^3.0.0 || ^4.0.0",
"doctrine/orm": "^2.14.0 || ^3.0.0",
"doctrine/persistence": "^2.1.0 || ^3.0.0",
"ergebnis/classy": "^1.6.0",
Expand Down
24 changes: 12 additions & 12 deletions composer.lock

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

0 comments on commit 51b5832

Please sign in to comment.