Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1a1aaa7

Browse filesBrowse files
committed
Revert "bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)"
This reverts commit f1f18ad, reversing changes made to 8e8ee09.
1 parent f1f18ad commit 1a1aaa7
Copy full SHA for 1a1aaa7

File tree

2 files changed

+0
-4
lines changed
Filter options

2 files changed

+0
-4
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
"sensio/framework-extra-bundle": "^3.0.2"
8686
},
8787
"conflict": {
88-
"egulias/email-validator": ">=2.0",
8988
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
9089
},
9190
"autoload": {

‎src/Symfony/Component/Validator/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/composer.json
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
"symfony/property-access": "For using the 2.4 Validator API",
4343
"symfony/expression-language": "For using the 2.4 Expression validator"
4444
},
45-
"conflict": {
46-
"egulias/email-validator": ">=2.0"
47-
},
4845
"autoload": {
4946
"psr-4": { "Symfony\\Component\\Validator\\": "" },
5047
"exclude-from-classmap": [

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.