Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)"

This reverts commit f1f18ad608, reversing changes made to 8e8ee09747.
2018-01-20 13:12:25 +01:00 · 2018-01-20 13:12:25 +01:00 · 1a1aaa74d6
parent f1f18ad608
commit 1a1aaa74d6
2 changed files with 0 additions and 4 deletions
--- 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": {
--- 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": [