diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.0'

Browse Source 
* 5.0:
  [Bridge/PhpUnit] dont conflict with phpunit 4.8
This commit is contained in:
Nicolas Grekas 2020-02-01 16:58:03 +01:00
commit 985f64b5af
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/PhpUnit/composer.json
View File

@ -24,7 +24,7 @@
"symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
}, },
"conflict": { "conflict": {
"phpunit/phpunit": "<5.4.3" "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
}, },
"autoload": { "autoload": {
"files": [ "bootstrap.php" ], "files": [ "bootstrap.php" ],