minor #28044 [DoctrineBridge] allow dev versions of Doctrine again (nicolas-grekas)
This PR was merged into the 3.4 branch.
Discussion
----------
[DoctrineBridge] allow dev versions of Doctrine again
| Q | A
| ------------- | ---
| Branch? | 3.4
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
I don't expect this to be green yet, but let's see progress on Doctrine side.
Submitted against 4.0 for now, but should be merged on 3.4 when green.
Commits
-------
83dcbe9096
[DoctrineBridge] allow dev versions of Doctrine again
This commit is contained in:
commit
b164db517c
@ -18,7 +18,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"php": "^5.5.9|>=7.0.8",
|
"php": "^5.5.9|>=7.0.8",
|
||||||
"ext-xml": "*",
|
"ext-xml": "*",
|
||||||
"doctrine/common": "~2.4@stable",
|
"doctrine/common": "~2.4",
|
||||||
"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",
|
||||||
@ -92,7 +92,7 @@
|
|||||||
"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/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,7 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^5.5.9|>=7.0.8",
|
"php": "^5.5.9|>=7.0.8",
|
||||||
"doctrine/common": "~2.4@stable",
|
"doctrine/common": "~2.4",
|
||||||
"symfony/polyfill-ctype": "~1.8",
|
"symfony/polyfill-ctype": "~1.8",
|
||||||
"symfony/polyfill-mbstring": "~1.0"
|
"symfony/polyfill-mbstring": "~1.0"
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user