Revert "minor #27609 Remove direct dependencies on doctrine/common (Majkl578)"

nicolas-grekas · nicolas-grekas · commit 5fe78a33d8f2 · 2018-06-25T13:45:21.000+02:00
This reverts commit 92c37b9, reversing changes made to bc8d4f6.
diff --git a/composer.json b/composer.json
@@ -18,9 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "ext-xml": "*",
-        "doctrine/collections": "~1.0",
-        "doctrine/event-manager": "~1.0",
-        "doctrine/persistence": "~1.0",
+        "doctrine/common": "~2.4@stable",
         "fig/link-util": "^1.0",
         "twig/twig": "^1.35|^2.4.4",
         "psr/cache": "~1.0",
@@ -93,7 +91,6 @@
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
         "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,9 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "doctrine/collections": "~1.0",
-        "doctrine/event-manager": "~1.0",
-        "doctrine/persistence": "~1.0",
+        "doctrine/common": "~2.4@stable",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-mbstring": "~1.0"
     },
@@ -35,12 +33,9 @@
         "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/reflection": "~1.0"
+        "doctrine/orm": "^2.4.5"
     },
     "conflict": {
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
