minor #37639 Allow doctrine/persistence 2 (derrabus)

nicolas-grekas · nicolas-grekas · commit 2c84ea2b1173 · 2020-07-23T18:50:08.000+02:00
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
diff --git a/composer.json b/composer.json
@@ -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",
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -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"
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
@@ -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",
