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 420789c

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: [Validator] Conflict with egulias/email-validator 2.0
2 parents e64cb18 + f1f18ad commit 420789c
Copy full SHA for 420789c

File tree

Expand file treeCollapse file tree

2 files changed

+4
-0
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+4
-0
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"sensio/framework-extra-bundle": "^3.0.2"
9494
},
9595
"conflict": {
96+
"egulias/email-validator": ">=2.0",
9697
"phpdocumentor/reflection": "<1.0.7",
9798
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
9899
},

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/composer.json
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@
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+
},
4548
"autoload": {
4649
"psr-4": { "Symfony\\Component\\Validator\\": "" },
4750
"exclude-from-classmap": [

0 commit comments

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