Add missing conflict rules for phpunit
This commit is contained in:
parent
50324777bf
commit
3e83e02f2c
@ -33,6 +33,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": "",
|
||||||
|
@ -48,6 +48,9 @@
|
|||||||
"symfony/yaml": "^2.0.5",
|
"symfony/yaml": "^2.0.5",
|
||||||
"sensio/framework-extra-bundle": "^3.0.2"
|
"sensio/framework-extra-bundle": "^3.0.2"
|
||||||
},
|
},
|
||||||
|
"conflict": {
|
||||||
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/console": "For using the console commands",
|
"symfony/console": "For using the console commands",
|
||||||
"symfony/form": "For using forms",
|
"symfony/form": "For using forms",
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
"symfony/translation": "^2.0.5"
|
"symfony/translation": "^2.0.5"
|
||||||
},
|
},
|
||||||
"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"
|
||||||
|
@ -18,6 +18,9 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.9"
|
"php": ">=5.3.9"
|
||||||
},
|
},
|
||||||
|
"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