minor #21684 Add missing conflict rules for phpunit (nicolas-grekas)
This PR was merged into the 2.7 branch.
Discussion
----------
Add missing conflict rules for phpunit
| Q | A
| ------------- | ---
| Branch? | 2.7
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
We forgot them in #21564
Commits
-------
3e83e02
Add missing conflict rules for phpunit
This commit is contained in:
commit
347f529206
@ -33,6 +33,9 @@
|
||||
"doctrine/dbal": "~2.4",
|
||||
"doctrine/orm": "^2.4.5"
|
||||
},
|
||||
"conflict": {
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/form": "",
|
||||
"symfony/validator": "",
|
||||
|
@ -48,6 +48,9 @@
|
||||
"symfony/yaml": "^2.0.5",
|
||||
"sensio/framework-extra-bundle": "^3.0.2"
|
||||
},
|
||||
"conflict": {
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/console": "For using the console commands",
|
||||
"symfony/form": "For using forms",
|
||||
|
@ -31,6 +31,7 @@
|
||||
"symfony/translation": "^2.0.5"
|
||||
},
|
||||
"conflict": {
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
|
||||
"symfony/doctrine-bridge": "<2.7",
|
||||
"symfony/framework-bundle": "<2.7",
|
||||
"symfony/twig-bridge": "<2.7"
|
||||
|
@ -18,6 +18,9 @@
|
||||
"require": {
|
||||
"php": ">=5.3.9"
|
||||
},
|
||||
"conflict": {
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||
},
|
||||
"suggest": {
|
||||
"ext-symfony_debug": ""
|
||||
},
|
||||
|
Reference in New Issue
Block a user