Skip to content

Commit

Permalink
Remove direct dependencies on doctrine/common
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Moravec authored and nicolas-grekas committed Jul 23, 2018
1 parent ffb515d commit c838d51
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
7 changes: 5 additions & 2 deletions composer.json
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
9 changes: 7 additions & 2 deletions src/Symfony/Bridge/Doctrine/composer.json
Expand Up @@ -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"
Expand All @@ -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",
Expand Down

0 comments on commit c838d51

Please sign in to comment.