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

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 | https://github.com/symfony/symfony/pull/25851#issuecomment-359166972
| 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
-------

1a1aaa74d6 Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)"
This commit is contained in:
Fabien Potencier 2018-01-21 08:22:52 +01:00
commit 1fedcffbb9
2 changed files with 0 additions and 4 deletions

View File

@ -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": {

View File

@ -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": [