Merge branch '5.0'

* 5.0: [Bridge/PhpUnit] dont conflict with phpunit 4.8
2020-02-01 16:58:03 +01:00 · 2020-02-01 16:58:03 +01:00 · 985f64b5af
parent fb732df025 4cce23d9ca
commit 985f64b5af
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Bridge/PhpUnit/composer.json
+++ b/src/Symfony/Bridge/PhpUnit/composer.json
@ -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" ],