minor #28038 Remove direct dependencies on doctrine/common (Majkl578)

nicolas-grekas · nicolas-grekas · commit 7fd8e981bb25 · 2018-08-01T18:12:16.000+02:00
This PR was merged into the 4.2-dev branch. Discussion ---------- Remove direct dependencies on doctrine/common | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Resubmitting #27609 now that Doctrine should be deprecation free. Commits ------- cb91cde Remove direct dependencies on doctrine/common
diff --git a/composer.json b/composer.json
@@ -18,7 +18,9 @@
     "require": {
         "php": "^7.1.3",
         "ext-xml": "*",
-        "doctrine/common": "~2.4@stable",
+        "doctrine/collections": "~1.0",
+        "doctrine/event-manager": "~1.0",
+        "doctrine/persistence": "~1.0",
         "fig/link-util": "^1.0",
         "twig/twig": "^1.35|^2.4.4",
         "psr/cache": "~1.0",
@@ -91,7 +93,8 @@
         "doctrine/cache": "~1.6",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
-        "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0",
+        "doctrine/orm": "~2.4,>=2.4.5",
+        "doctrine/reflection": "~1.0",
         "doctrine/doctrine-bundle": "~1.4",
         "monolog/monolog": "~1.11",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -17,7 +17,9 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "doctrine/common": "~2.4@stable",
+        "doctrine/collections": "~1.0",
+        "doctrine/event-manager": "~1.0",
+        "doctrine/persistence": "~1.0",
         "symfony/contracts": "^1.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0"
@@ -34,9 +36,12 @@
         "symfony/expression-language": "~3.4|~4.0",
         "symfony/validator": "~3.4|~4.0",
         "symfony/translation": "~3.4|~4.0",
+        "doctrine/annotations": "~1.0",
+        "doctrine/cache": "~1.6",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
-        "doctrine/orm": "^2.4.5"
+        "doctrine/orm": "^2.4.5",
+        "doctrine/reflection": "~1.0"
     },
     "conflict": {
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
