From 1a1aaa74d666f203c9c76faebc20e22cebba8f8c Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 20 Jan 2018 13:12:25 +0100 Subject: [PATCH] Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)" This reverts commit f1f18ad6082e8cd2f7ece5bc756545e50bd167ea, reversing changes made to 8e8ee0974720b52dbde2976bdd8942e4265e4408. --- composer.json | 1 - src/Symfony/Component/Validator/composer.json | 3 --- 2 files changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 8a81a9f90df61..f263c15d45324 100644 --- a/composer.json +++ b/composer.json @@ -85,7 +85,6 @@ "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 fc5f3c8137212..e6db2e6907f0e 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -42,9 +42,6 @@ "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": [