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 d8cfa3e

Browse filesBrowse files
fabpotfabpot
committed
bug #39685 [Mailer][Mime][TwigBridge][Validator] Allow egulias/email-validator 3.x (derrabus)
This PR was merged into the 4.4 branch. Discussion ---------- [Mailer][Mime][TwigBridge][Validator] Allow egulias/email-validator 3.x | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #39656 | License | MIT | Doc PR | N/A Commits ------- 3beeadb Allow egulias/email-validator 3.x
2 parents b04a7c1 + 3beeadb commit d8cfa3e
Copy full SHA for d8cfa3e

File tree

Expand file treeCollapse file tree

8 files changed

+13
-10
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+13
-10
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"predis/predis": "~1.1",
135135
"psr/http-client": "^1.0",
136136
"psr/simple-cache": "^1.0",
137-
"egulias/email-validator": "^2.1.10",
137+
"egulias/email-validator": "^2.1.10|^3.1",
138138
"symfony/phpunit-bridge": "^5.2",
139139
"symfony/security-acl": "~2.8|~3.0",
140140
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
@@ -143,6 +143,7 @@
143143
"twig/markdown-extra": "^2.12"
144144
},
145145
"conflict": {
146+
"egulias/email-validator": "~3.0.0",
146147
"masterminds/html5": "<2.6",
147148
"monolog/monolog": ">=2",
148149
"phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",

‎src/Symfony/Bridge/Twig/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"twig/twig": "^1.43|^2.13|^3.0.4"
2222
},
2323
"require-dev": {
24-
"egulias/email-validator": "^2.1.10",
24+
"egulias/email-validator": "^2.1.10|^3",
2525
"symfony/asset": "^3.4|^4.0|^5.0",
2626
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
2727
"symfony/error-handler": "^4.4|^5.0",

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Mailer/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=7.1.3",
20-
"egulias/email-validator": "^2.1.10",
20+
"egulias/email-validator": "^2.1.10|^3",
2121
"psr/log": "~1.0",
2222
"symfony/event-dispatcher": "^4.3",
2323
"symfony/mime": "^4.4|^5.0",

‎src/Symfony/Component/Mime/Address.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Address.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Mime;
1313

1414
use Egulias\EmailValidator\EmailValidator;
15+
use Egulias\EmailValidator\Validation\MessageIDValidation;
1516
use Egulias\EmailValidator\Validation\RFCValidation;
1617
use Symfony\Component\Mime\Encoder\IdnAddressEncoder;
1718
use Symfony\Component\Mime\Exception\InvalidArgumentException;
@@ -51,7 +52,7 @@ public function __construct(string $address, string $name = '')
5152
$this->address = trim($address);
5253
$this->name = trim(str_replace(["\n", "\r"], '', $name));
5354

54-
if (!self::$validator->isValid($this->address, new RFCValidation())) {
55+
if (!self::$validator->isValid($this->address, class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation())) {
5556
throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address));
5657
}
5758
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/composer.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
"symfony/polyfill-mbstring": "^1.0"
2222
},
2323
"require-dev": {
24-
"egulias/email-validator": "^2.1.10",
24+
"egulias/email-validator": "^2.1.10|^3.1",
2525
"symfony/dependency-injection": "^3.4|^4.1|^5.0"
2626
},
2727
"conflict": {
28+
"egulias/email-validator": "~3.0.0",
2829
"symfony/mailer": "<4.4"
2930
},
3031
"autoload": {

‎src/Symfony/Component/Validator/Constraints/EmailValidator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/EmailValidator.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function validate($value, Constraint $constraint)
109109

110110
if (Email::VALIDATION_MODE_STRICT === $constraint->mode) {
111111
if (!class_exists(EguliasEmailValidator::class)) {
112-
throw new LogicException('Strict email validation requires egulias/email-validator ~1.2|~2.0.');
112+
throw new LogicException('Strict email validation requires egulias/email-validator ^2.1.10|^3.');
113113
}
114114

115115
$strictValidator = new EguliasEmailValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testLegacyValidatorConstructorStrict()
3535
{
3636
$this->validator = new EmailValidator(true);
3737
$this->validator->initialize($this->context);
38-
$this->validator->validate('example@localhost', new Email());
38+
$this->validator->validate('example@mywebsite.tld', new Email());
3939

4040
$this->assertNoViolation();
4141
}
@@ -211,7 +211,7 @@ public function testModeStrict()
211211
{
212212
$constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]);
213213

214-
$this->validator->validate('example@localhost', $constraint);
214+
$this->validator->validate('example@mywebsite.tld', $constraint);
215215

216216
$this->assertNoViolation();
217217
}
@@ -256,7 +256,7 @@ public function testStrict()
256256
{
257257
$constraint = new Email(['strict' => true]);
258258

259-
$this->validator->validate('example@localhost', $constraint);
259+
$this->validator->validate('example@mywebsite.tld', $constraint);
260260

261261
$this->assertNoViolation();
262262
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"symfony/translation": "^4.2",
3838
"doctrine/annotations": "^1.10.4",
3939
"doctrine/cache": "~1.0",
40-
"egulias/email-validator": "^2.1.10"
40+
"egulias/email-validator": "^2.1.10|^3"
4141
},
4242
"conflict": {
4343
"doctrine/lexer": "<1.0.2",

0 commit comments

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