From c838d51e383fbeafe721280c777ec6c09a95bf4b Mon Sep 17 00:00:00 2001 From: Michael Moravec Date: Fri, 15 Jun 2018 02:15:56 +0200 Subject: [PATCH] Remove direct dependencies on doctrine/common --- composer.json | 7 +++++-- src/Symfony/Bridge/Doctrine/composer.json | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 9f6d070b31ad5..fc42f7b955171 100644 --- 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 index c73068995e1c2..cc344b2039ed7 100644 --- 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",