From 72d8e8adb0d76da3559e4942ae53eee981fea5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edi=20Modri=C4=87?= <edi.modric@gmail.com>
Date: Sat, 20 Jan 2018 00:08:53 +0100
Subject: [PATCH] [Validator] Conflict with egulias/email-validator 2.0

---
 composer.json                                 | 1 +
 src/Symfony/Component/Validator/composer.json | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index f263c15d4532..8a81a9f90df6 100644
--- a/composer.json
+++ b/composer.json
@@ -85,6 +85,7 @@
         "sensio/framework-extra-bundle": "^3.0.2"
     },
     "conflict": {
+        "egulias/email-validator": ">=2.0",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
index e6db2e6907f0..fc5f3c813721 100644
--- a/src/Symfony/Component/Validator/composer.json
+++ b/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": [