Merge branch '5.0'
* 5.0: [Bridge/PhpUnit] dont conflict with phpunit 4.8
This commit is contained in:
commit
985f64b5af
@ -24,7 +24,7 @@
|
||||
"symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
|
||||
},
|
||||
"conflict": {
|
||||
"phpunit/phpunit": "<5.4.3"
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||
},
|
||||
"autoload": {
|
||||
"files": [ "bootstrap.php" ],
|
||||
|
Reference in New Issue
Block a user