Merge branch '2.8' into 3.2
* 2.8: Add missing conflict rules for phpunit
This commit is contained in:
commit
3d4e163ddb
@ -36,6 +36,9 @@
|
|||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4",
|
||||||
"doctrine/orm": "^2.4.5"
|
"doctrine/orm": "^2.4.5"
|
||||||
},
|
},
|
||||||
|
"conflict": {
|
||||||
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/form": "",
|
"symfony/form": "",
|
||||||
"symfony/validator": "",
|
"symfony/validator": "",
|
||||||
|
@ -59,7 +59,8 @@
|
|||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpdocumentor/reflection-docblock": "<3.0",
|
"phpdocumentor/reflection-docblock": "<3.0",
|
||||||
"phpdocumentor/type-resolver": "<0.2.0"
|
"phpdocumentor/type-resolver": "<0.2.0",
|
||||||
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-apcu": "For best performance of the system caches",
|
"ext-apcu": "For best performance of the system caches",
|
||||||
|
@ -34,6 +34,7 @@
|
|||||||
"symfony/var-dumper": "~3.2"
|
"symfony/var-dumper": "~3.2"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
|
||||||
"symfony/doctrine-bridge": "<2.7",
|
"symfony/doctrine-bridge": "<2.7",
|
||||||
"symfony/framework-bundle": "<2.7",
|
"symfony/framework-bundle": "<2.7",
|
||||||
"symfony/twig-bridge": "<2.7"
|
"symfony/twig-bridge": "<2.7"
|
||||||
|
@ -31,6 +31,9 @@
|
|||||||
"doctrine/cache": "~1.0",
|
"doctrine/cache": "~1.0",
|
||||||
"egulias/email-validator": "^1.2.8|~2.0"
|
"egulias/email-validator": "^1.2.8|~2.0"
|
||||||
},
|
},
|
||||||
|
"conflict": {
|
||||||
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"psr/cache-implementation": "For using the metadata cache.",
|
"psr/cache-implementation": "For using the metadata cache.",
|
||||||
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
|
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
|
||||||
|
@ -22,6 +22,9 @@
|
|||||||
"require-dev": {
|
"require-dev": {
|
||||||
"twig/twig": "~1.20|~2.0"
|
"twig/twig": "~1.20|~2.0"
|
||||||
},
|
},
|
||||||
|
"conflict": {
|
||||||
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-symfony_debug": ""
|
"ext-symfony_debug": ""
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user