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 ce8be3c

Browse filesBrowse files
derrabusderrabus
committed
Merge branch '4.4' into 5.2
* 4.4: Allow egulias/email-validator 3.x
2 parents 4667c85 + d8cfa3e commit ce8be3c
Copy full SHA for ce8be3c

File tree

Expand file treeCollapse file tree

7 files changed

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

7 files changed

+10
-7
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
@@ -145,7 +145,7 @@
145145
"predis/predis": "~1.1",
146146
"psr/http-client": "^1.0",
147147
"psr/simple-cache": "^1.0",
148-
"egulias/email-validator": "^2.1.10",
148+
"egulias/email-validator": "^2.1.10|^3.1",
149149
"symfony/phpunit-bridge": "^5.2",
150150
"symfony/security-acl": "~2.8|~3.0",
151151
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
@@ -155,6 +155,7 @@
155155
},
156156
"conflict": {
157157
"doctrine/dbal": "<2.10",
158+
"egulias/email-validator": "~3.0.0",
158159
"masterminds/html5": "<2.6",
159160
"phpdocumentor/reflection-docblock": "<3.2.2",
160161
"phpdocumentor/type-resolver": "<1.4.0",

‎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
@@ -22,7 +22,7 @@
2222
"twig/twig": "^2.13|^3.0.4"
2323
},
2424
"require-dev": {
25-
"egulias/email-validator": "^2.1.10",
25+
"egulias/email-validator": "^2.1.10|^3",
2626
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
2727
"symfony/asset": "^4.4|^5.0",
2828
"symfony/dependency-injection": "^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.2.5",
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.4|^5.0",
2323
"symfony/mime": "^5.2",

‎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
@@ -23,14 +23,15 @@
2323
"symfony/polyfill-php80": "^1.15"
2424
},
2525
"require-dev": {
26-
"egulias/email-validator": "^2.1.10",
26+
"egulias/email-validator": "^2.1.10|^3.1",
2727
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
2828
"symfony/dependency-injection": "^4.4|^5.0",
2929
"symfony/property-access": "^4.4|^5.1",
3030
"symfony/property-info": "^4.4|^5.1",
3131
"symfony/serializer": "^5.2"
3232
},
3333
"conflict": {
34+
"egulias/email-validator": "~3.0.0",
3435
"phpdocumentor/reflection-docblock": "<3.2.2",
3536
"phpdocumentor/type-resolver": "<1.4.0",
3637
"symfony/mailer": "<4.4"

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public function testModeStrict()
197197
{
198198
$constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]);
199199

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

202202
$this->assertNoViolation();
203203
}

‎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
@@ -42,7 +42,7 @@
4242
"symfony/translation": "^4.4|^5.0",
4343
"doctrine/annotations": "^1.10.4",
4444
"doctrine/cache": "~1.0",
45-
"egulias/email-validator": "^2.1.10"
45+
"egulias/email-validator": "^2.1.10|^3"
4646
},
4747
"conflict": {
4848
"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.