Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)"
This reverts commitf1f18ad608
, reversing changes made to8e8ee09747
.
This commit is contained in:
parent
f1f18ad608
commit
1a1aaa74d6
@ -85,7 +85,6 @@
|
|||||||
"sensio/framework-extra-bundle": "^3.0.2"
|
"sensio/framework-extra-bundle": "^3.0.2"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"egulias/email-validator": ">=2.0",
|
|
||||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -42,9 +42,6 @@
|
|||||||
"symfony/property-access": "For using the 2.4 Validator API",
|
"symfony/property-access": "For using the 2.4 Validator API",
|
||||||
"symfony/expression-language": "For using the 2.4 Expression validator"
|
"symfony/expression-language": "For using the 2.4 Expression validator"
|
||||||
},
|
},
|
||||||
"conflict": {
|
|
||||||
"egulias/email-validator": ">=2.0"
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": { "Symfony\\Component\\Validator\\": "" },
|
"psr-4": { "Symfony\\Component\\Validator\\": "" },
|
||||||
"exclude-from-classmap": [
|
"exclude-from-classmap": [
|
||||||
|
Reference in New Issue
Block a user