Skip to content

Commit 8f9a896

Browse files
Merge branch '5.0'
* 5.0: [Bridge/PhpUnit] dont conflict with phpunit 4.8
2 parents c71a163 + 6b6f045 commit 8f9a896

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
2525
},
2626
"conflict": {
27-
"phpunit/phpunit": "<5.4.3"
27+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
2828
},
2929
"autoload": {
3030
"files": [ "bootstrap.php" ],

0 commit comments

Comments
 (0)