Skip to content

Commit

Permalink
minor #37639 Allow doctrine/persistence 2 (derrabus)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 4.4 branch.

Discussion
----------

Allow doctrine/persistence 2

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | N/A
| License       | MIT
| Doc PR        | N/A

Replaces #37416.

This PR unblocks the installation of `doctrine/persistence` version 2.

Notes:
* I had to bump `doctrine/data-fixtures` because composer would otherwise downgrade to an ancient alpha release with incomplete version constraints. This package is a dev dependency for our tests, so I think we're good here.
  **edit**: Moved to #37640.
* Until doctrine/data-fixtures#349 has been resolved, Doctrine/Bridge cannot be tested with version 2 of `doctrine/persistence`.

Commits
-------

cd22fe6 Allow doctrine/persistence 2
  • Loading branch information
nicolas-grekas committed Jul 23, 2020
2 parents 4a8f11c + cd22fe6 commit 2c84ea2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": ">=7.1.3",
"ext-xml": "*",
"doctrine/event-manager": "~1.0",
"doctrine/persistence": "^1.3",
"doctrine/persistence": "^1.3|^2",
"twig/twig": "^1.41|^2.10|^3.0",
"psr/cache": "~1.0",
"psr/container": "^1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/Doctrine/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require": {
"php": ">=7.1.3",
"doctrine/event-manager": "~1.0",
"doctrine/persistence": "^1.3",
"doctrine/persistence": "^1.3|^2",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^1.1|^2"
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Messenger/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"require-dev": {
"doctrine/dbal": "^2.6|^3.0",
"doctrine/persistence": "^1.3",
"doctrine/persistence": "^1.3|^2",
"psr/cache": "~1.0",
"symfony/console": "^3.4|^4.0|^5.0",
"symfony/dependency-injection": "^3.4.19|^4.1.8|^5.0",
Expand Down

0 comments on commit 2c84ea2

Please sign in to comment.