bug #25861 do not conflict with egulias/email-validator 2.0+ (xabbuh)

fabpot · fabpot · commit 1fedcffbb935 · 2018-01-21T08:22:52.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- do not conflict with egulias/email-validator 2.0+ | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25851 (comment) | License | MIT | Doc PR | Not allowing `egulias/email-validator` 2.0+ will prevent applications using this package from updating to the next patch release. Commits ------- 1a1aaa7 Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)"
diff --git 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
@@ -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": [
