Merge branch '2.7' into 2.8

* 2.7:
  [Validator] Conflict with egulias/email-validator 2.0

Author: fabpot

composer.json

@@ -93,6 +93,7 @@
         "sensio/framework-extra-bundle": "^3.0.2"
     },
     "conflict": {
+        "egulias/email-validator": ">=2.0",
         "phpdocumentor/reflection": "<1.0.7",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },

src/Symfony/Component/Validator/composer.json

@@ -42,6 +42,9 @@
         "symfony/property-access": "For using the 2.4 Validator API",
         "symfony/expression-language": "For using the 2.4 Expression validator"
     },
+    "conflict": {
+        "egulias/email-validator": ">=2.0"
+    },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Validator\\": "" },
         "exclude-from-classmap": [