Allow egulias/email-validator 3.x

derrabus · derrabus · commit 3beeadb0c392 · 2021-03-07T16:14:50.000+01:00
diff --git a/composer.json b/composer.json
@@ -134,7 +134,7 @@
         "predis/predis": "~1.1",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0",
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3.1",
         "symfony/phpunit-bridge": "^5.2",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
@@ -143,6 +143,7 @@
         "twig/markdown-extra": "^2.12"
     },
     "conflict": {
+        "egulias/email-validator": "~3.0.0",
         "masterminds/html5": "<2.6",
         "monolog/monolog": ">=2",
         "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -21,7 +21,7 @@
         "twig/twig": "^1.43|^2.13|^3.0.4"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3",
         "symfony/asset": "^3.4|^4.0|^5.0",
         "symfony/dependency-injection": "^3.4|^4.0|^5.0",
         "symfony/error-handler": "^4.4|^5.0",
diff --git a/src/Symfony/Component/Mailer/composer.json b/src/Symfony/Component/Mailer/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3",
         "psr/log": "~1.0",
         "symfony/event-dispatcher": "^4.3",
         "symfony/mime": "^4.4|^5.0",
diff --git a/src/Symfony/Component/Mime/Address.php b/src/Symfony/Component/Mime/Address.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mime;
 
 use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\MessageIDValidation;
 use Egulias\EmailValidator\Validation\RFCValidation;
 use Symfony\Component\Mime\Encoder\IdnAddressEncoder;
 use Symfony\Component\Mime\Exception\InvalidArgumentException;
@@ -51,7 +52,7 @@ public function __construct(string $address, string $name = '')
         $this->address = trim($address);
         $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));
         }
     }
diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
@@ -21,10 +21,11 @@
         "symfony/polyfill-mbstring": "^1.0"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3.1",
         "symfony/dependency-injection": "^3.4|^4.1|^5.0"
     },
     "conflict": {
+        "egulias/email-validator": "~3.0.0",
         "symfony/mailer": "<4.4"
     },
     "autoload": {
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -109,7 +109,7 @@ public function validate($value, Constraint $constraint)
 
         if (Email::VALIDATION_MODE_STRICT === $constraint->mode) {
             if (!class_exists(EguliasEmailValidator::class)) {
-                throw new LogicException('Strict email validation requires egulias/email-validator ~1.2|~2.0.');
+                throw new LogicException('Strict email validation requires egulias/email-validator ^2.1.10|^3.');
             }
 
             $strictValidator = new EguliasEmailValidator();
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -35,7 +35,7 @@ public function testLegacyValidatorConstructorStrict()
     {
         $this->validator = new EmailValidator(true);
         $this->validator->initialize($this->context);
-        $this->validator->validate('example@localhost', new Email());
+        $this->validator->validate('example@mywebsite.tld', new Email());
 
         $this->assertNoViolation();
     }
@@ -211,7 +211,7 @@ public function testModeStrict()
     {
         $constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]);
 
-        $this->validator->validate('example@localhost', $constraint);
+        $this->validator->validate('example@mywebsite.tld', $constraint);
 
         $this->assertNoViolation();
     }
@@ -256,7 +256,7 @@ public function testStrict()
     {
         $constraint = new Email(['strict' => true]);
 
-        $this->validator->validate('example@localhost', $constraint);
+        $this->validator->validate('example@mywebsite.tld', $constraint);
 
         $this->assertNoViolation();
     }
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -37,7 +37,7 @@
         "symfony/translation": "^4.2",
         "doctrine/annotations": "^1.10.4",
         "doctrine/cache": "~1.0",
-        "egulias/email-validator": "^2.1.10"
+        "egulias/email-validator": "^2.1.10|^3"
     },
     "conflict": {
         "doctrine/lexer": "<1.0.2",

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Mime;`
`13`	`13`
`14`	`14`	`use Egulias\EmailValidator\EmailValidator;`
	`15`	`+use Egulias\EmailValidator\Validation\MessageIDValidation;`
`15`	`16`	`use Egulias\EmailValidator\Validation\RFCValidation;`
`16`	`17`	`use Symfony\Component\Mime\Encoder\IdnAddressEncoder;`
`17`	`18`	`use Symfony\Component\Mime\Exception\InvalidArgumentException;`
`@@ -51,7 +52,7 @@ public function __construct(string $address, string $name = '')`
`51`	`52`	`$this->address = trim($address);`
`52`	`53`	`$this->name = trim(str_replace(["\n", "\r"], '', $name));`
`53`	`54`
`54`		`- if (!self::$validator->isValid($this->address, new RFCValidation())) {`
	`55`	`+ if (!self::$validator->isValid($this->address, class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation())) {`
`55`	`56`	`throw new RfcComplianceException(sprintf('Email "%s" does not comply with addr-spec of RFC 2822.', $address));`
`56`	`57`	`}`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function validate($value, Constraint $constraint)`
`109`	`109`
`110`	`110`	`if (Email::VALIDATION_MODE_STRICT === $constraint->mode) {`
`111`	`111`	`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.');`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`$strictValidator = new EguliasEmailValidator();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testLegacyValidatorConstructorStrict()`
`35`	`35`	`{`
`36`	`36`	`$this->validator = new EmailValidator(true);`
`37`	`37`	`$this->validator->initialize($this->context);`
`38`		`- $this->validator->validate('example@localhost', new Email());`
	`38`	`+ $this->validator->validate('example@mywebsite.tld', new Email());`
`39`	`39`
`40`	`40`	`$this->assertNoViolation();`
`41`	`41`	`}`
`@@ -211,7 +211,7 @@ public function testModeStrict()`
`211`	`211`	`{`
`212`	`212`	`$constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]);`
`213`	`213`
`214`		`- $this->validator->validate('example@localhost', $constraint);`
	`214`	`+ $this->validator->validate('example@mywebsite.tld', $constraint);`
`215`	`215`
`216`	`216`	`$this->assertNoViolation();`
`217`	`217`	`}`
`@@ -256,7 +256,7 @@ public function testStrict()`
`256`	`256`	`{`
`257`	`257`	`$constraint = new Email(['strict' => true]);`
`258`	`258`
`259`		`- $this->validator->validate('example@localhost', $constraint);`
	`259`	`+ $this->validator->validate('example@mywebsite.tld', $constraint);`
`260`	`260`
`261`	`261`	`$this->assertNoViolation();`
`262`	`262`	`}`