Skip to content

Commit

Permalink
Merge pull request #912 from OskarStark/doctrine-collections-2
Browse files Browse the repository at this point in the history
Allow `doctrine/collections` 2
  • Loading branch information
localheinz committed Nov 7, 2022
2 parents c0c46e6 + 60ce608 commit 57b4077
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 14 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Expand Up @@ -6,7 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`1.0.0...main`][1.0.0...main].
For a full diff see [`1.1.0...main`][1.1.0...main].

### Changedn

- Allowed installation of `doctrine/collections:^2.0.0` ([#912]), by [@OskarStark]

## [`1.0.0`][1.0.0]

Expand Down Expand Up @@ -185,6 +189,7 @@ For a full diff see [`fa9c564...0.1.0`][fa9c564...0.1.0].
[0.5.0]: https://github.com/ergebnis/factory-bot/releases/tag/0.5.0
[0.6.0]: https://github.com/ergebnis/factory-bot/releases/tag/0.6.0
[1.0.0]: https://github.com/ergebnis/factory-bot/releases/tag/1.0.0
[1.1.0]: https://github.com/ergebnis/factory-bot/releases/tag/1.1.0

[fa9c564...0.1.0]: https://github.com/ergebnis/factory-bot/compare/fa9c564...0.1.0
[0.1.0...0.2.0]: https://github.com/ergebnis/factory-bot/compare/0.1.0...0.2.0
Expand All @@ -196,7 +201,8 @@ For a full diff see [`fa9c564...0.1.0`][fa9c564...0.1.0].
[0.4.0...0.5.0]: https://github.com/ergebnis/factory-bot/compare/0.4.0...0.5.0
[0.5.0...0.6.0]: https://github.com/ergebnis/factory-bot/compare/0.5.0...0.6.0
[0.6.0...1.0.0]: https://github.com/ergebnis/factory-bot/compare/0.6.0...1.0.0
[1.0.0...main]: https://github.com/ergebnis/factory-bot/compare/1.0.0...main
[1.0.0...1.1.0]: https://github.com/ergebnis/factory-bot/compare/1.0.0...1.1.0
[1.1.0...main]: https://github.com/ergebnis/factory-bot/compare/1.1.0...main

[#1]: https://github.com/ergebnis/factory-bot/pull/1
[#3]: https://github.com/ergebnis/factory-bot/pull/3
Expand Down Expand Up @@ -277,6 +283,8 @@ For a full diff see [`fa9c564...0.1.0`][fa9c564...0.1.0].
[#499]: https://github.com/ergebnis/factory-bot/pull/499
[#682]: https://github.com/ergebnis/factory-bot/pull/682
[#702]: https://github.com/ergebnis/factory-bot/pull/702
[#912]: https://github.com/ergebnis/factory-bot/pull/912

[@abenerd]: https://github.com/abenerd
[@localheinz]: https://github.com/localheinz
[@OskarStark]: https://github.com/OskarStark
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -24,7 +24,7 @@
"require": {
"php": "^7.4 || ^8.0",
"doctrine/annotations": "^1.10.3",
"doctrine/collections": "^1.6.5",
"doctrine/collections": "^1.6.5 || ^2.0.0",
"doctrine/dbal": "^2.12.0 || ^3.0.0",
"doctrine/orm": "^2.8.0",
"doctrine/persistence": "^2.1.0",
Expand Down
66 changes: 55 additions & 11 deletions composer.lock

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

0 comments on commit 57b4077

Please sign in to comment.