Skip to content

Commit

Permalink
Revert "minor #27609 Remove direct dependencies on doctrine/common (M…
Browse files Browse the repository at this point in the history
…ajkl578)"

This reverts commit 92c37b9, reversing
changes made to bc8d4f6.
  • Loading branch information
nicolas-grekas committed Jun 25, 2018
2 parents 7b6ad74 + 0cfbed1 commit 5fe78a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
5 changes: 1 addition & 4 deletions composer.json
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
9 changes: 2 additions & 7 deletions src/Symfony/Bridge/Doctrine/composer.json
Expand Up @@ -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"
},
Expand All @@ -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",
Expand Down

0 comments on commit 5fe78a3

Please sign in to comment.