Merge branch '2.7' into 2.8

* 2.7:
  Add missing conflict rules for phpunit

src/Symfony/Bridge/Doctrine/composer.json

@@ -35,6 +35,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": "",

src/Symfony/Bundle/FrameworkBundle/composer.json

@@ -53,6 +53,9 @@
         "twig/twig": "~1.23|~2.0",
         "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",

src/Symfony/Component/Form/composer.json

@@ -33,6 +33,7 @@
         "symfony/translation": "^2.0.5|~3.0.0"
     },
     "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"

src/Symfony/Component/VarDumper/composer.json

@@ -22,6 +22,9 @@
     "require-dev": {
         "twig/twig": "~1.20|~2.0"
     },
+    "conflict": {
+        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+    },
     "suggest": {
         "ext-symfony_debug": ""
     },