diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.2' into 5.x

Browse Source 
* 5.2:
  Allow egulias/email-validator 3.x
This commit is contained in:
Alexander M. Turek 2021-03-07 17:16:20 +01:00
commit 10d869d835
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -140,7 +140,7 @@
"predis/predis": "~1.1", "predis/predis": "~1.1",
"psr/http-client": "^1.0", "psr/http-client": "^1.0",
"psr/simple-cache": "^1.0", "psr/simple-cache": "^1.0",
"egulias/email-validator": "^2.1.10", "egulias/email-validator": "^2.1.10|^3.1",
"symfony/mercure-bundle": "^0.2", "symfony/mercure-bundle": "^0.2",
"symfony/phpunit-bridge": "^5.2", "symfony/phpunit-bridge": "^5.2",
"symfony/security-acl": "~2.8|~3.0", "symfony/security-acl": "~2.8|~3.0",
@ -153,6 +153,7 @@
"async-aws/core": "<1.5", "async-aws/core": "<1.5",
"doctrine/annotations": "<1.12", "doctrine/annotations": "<1.12",
"doctrine/dbal": "<2.10", "doctrine/dbal": "<2.10",
"egulias/email-validator": "~3.0.0",
"masterminds/html5": "<2.6", "masterminds/html5": "<2.6",
"phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0", "phpdocumentor/type-resolver": "<1.4.0",

2
src/Symfony/Bridge/Twig/composer.json
View File

@ -23,7 +23,7 @@
}, },
"require-dev": { "require-dev": {
"doctrine/annotations": "^1.12", "doctrine/annotations": "^1.12",
"egulias/email-validator": "^2.1.10", "egulias/email-validator": "^2.1.10|^3",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"symfony/asset": "^4.4|^5.0", "symfony/asset": "^4.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0", "symfony/dependency-injection": "^4.4|^5.0",

2
src/Symfony/Component/Mailer/composer.json
View File

@ -17,7 +17,7 @@
], ],
"require": { "require": {
"php": ">=7.2.5", "php": ">=7.2.5",
"egulias/email-validator": "^2.1.10", "egulias/email-validator": "^2.1.10|^3",
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/event-dispatcher": "^4.4|^5.0", "symfony/event-dispatcher": "^4.4|^5.0",
"symfony/mime": "^5.2", "symfony/mime": "^5.2",

3
src/Symfony/Component/Mime/Address.php
View File

@ -12,6 +12,7 @@
namespace Symfony\Component\Mime; namespace Symfony\Component\Mime;
use Egulias\EmailValidator\EmailValidator; use Egulias\EmailValidator\EmailValidator;
use Egulias\EmailValidator\Validation\MessageIDValidation;
use Egulias\EmailValidator\Validation\RFCValidation; use Egulias\EmailValidator\Validation\RFCValidation;
use Symfony\Component\Mime\Encoder\IdnAddressEncoder; use Symfony\Component\Mime\Encoder\IdnAddressEncoder;
use Symfony\Component\Mime\Exception\InvalidArgumentException; use Symfony\Component\Mime\Exception\InvalidArgumentException;
@ -51,7 +52,7 @@ final class Address
$this->address = trim($address); $this->address = trim($address);
$this->name = trim(str_replace(["\n", "\r"], '', $name)); $this->name = trim(str_replace(["\n", "\r"], '', $name));
if (!self::$validator->isValid($this->address, new RFCValidation())) { if (!self::$validator->isValid($this->address, class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation())) {
throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address)); throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address));
} }
} }

3
src/Symfony/Component/Mime/composer.json
View File

@ -23,7 +23,7 @@
"symfony/polyfill-php80": "^1.15" "symfony/polyfill-php80": "^1.15"
}, },
"require-dev": { "require-dev": {
"egulias/email-validator": "^2.1.10", "egulias/email-validator": "^2.1.10|^3.1",
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
"symfony/dependency-injection": "^4.4|^5.0", "symfony/dependency-injection": "^4.4|^5.0",
"symfony/property-access": "^4.4|^5.1", "symfony/property-access": "^4.4|^5.1",
@ -31,6 +31,7 @@
"symfony/serializer": "^5.2" "symfony/serializer": "^5.2"
}, },
"conflict": { "conflict": {
"egulias/email-validator": "~3.0.0",
"phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/reflection-docblock": "<3.2.2",
"phpdocumentor/type-resolver": "<1.4.0", "phpdocumentor/type-resolver": "<1.4.0",
"symfony/mailer": "<4.4" "symfony/mailer": "<4.4"

2
src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
View File

@ -197,7 +197,7 @@ class EmailValidatorTest extends ConstraintValidatorTestCase
{ {
$constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]); $constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]);
$this->validator->validate('example@localhost', $constraint); $this->validator->validate('example@mywebsite.tld', $constraint);
$this->assertNoViolation(); $this->assertNoViolation();
} }

2
src/Symfony/Component/Validator/composer.json
View File

@ -42,7 +42,7 @@
"symfony/translation": "^4.4|^5.0", "symfony/translation": "^4.4|^5.0",
"doctrine/annotations": "^1.10.4", "doctrine/annotations": "^1.10.4",
"doctrine/cache": "~1.0", "doctrine/cache": "~1.0",
"egulias/email-validator": "^2.1.10" "egulias/email-validator": "^2.1.10|^3"
}, },
"conflict": { "conflict": {
"doctrine/lexer": "<1.0.2", "doctrine/lexer": "<1.0.2",