minor #21684 Add missing conflict rules for phpunit (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 347f52920607 · 2017-02-20T14:37:10.000+01:00
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
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -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": "",
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -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",
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -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"
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json
@@ -18,6 +18,9 @@
     "require": {
         "php": ">=5.3.9"
     },
+    "conflict": {
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+    },
     "suggest": {
         "ext-symfony_debug": ""
     },
