minor #28038 Remove direct dependencies on doctrine/common (Majkl578)
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
-------
cb91cdef91
Remove direct dependencies on doctrine/common
This commit is contained in:
commit
7fd8e981bb
@ -18,7 +18,9 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3",
|
"php": "^7.1.3",
|
||||||
"ext-xml": "*",
|
"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",
|
"fig/link-util": "^1.0",
|
||||||
"twig/twig": "^1.35|^2.4.4",
|
"twig/twig": "^1.35|^2.4.4",
|
||||||
"psr/cache": "~1.0",
|
"psr/cache": "~1.0",
|
||||||
@ -91,7 +93,8 @@
|
|||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.4",
|
"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",
|
"doctrine/doctrine-bundle": "~1.4",
|
||||||
"monolog/monolog": "~1.11",
|
"monolog/monolog": "~1.11",
|
||||||
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
|
"ocramius/proxy-manager": "~0.4|~1.0|~2.0",
|
||||||
|
@ -17,7 +17,9 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1.3",
|
"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/contracts": "^1.0",
|
||||||
"symfony/polyfill-ctype": "~1.8",
|
"symfony/polyfill-ctype": "~1.8",
|
||||||
"symfony/polyfill-mbstring": "~1.0"
|
"symfony/polyfill-mbstring": "~1.0"
|
||||||
@ -34,9 +36,12 @@
|
|||||||
"symfony/expression-language": "~3.4|~4.0",
|
"symfony/expression-language": "~3.4|~4.0",
|
||||||
"symfony/validator": "~3.4|~4.0",
|
"symfony/validator": "~3.4|~4.0",
|
||||||
"symfony/translation": "~3.4|~4.0",
|
"symfony/translation": "~3.4|~4.0",
|
||||||
|
"doctrine/annotations": "~1.0",
|
||||||
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4",
|
||||||
"doctrine/orm": "^2.4.5"
|
"doctrine/orm": "^2.4.5",
|
||||||
|
"doctrine/reflection": "~1.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
|
||||||
|
Reference in New Issue
Block a user