Allow egulias/email-validator 3.x

derrabus · derrabus · commit f6f5404cc98d · 2021-01-02T20:44:30.000+01:00
diff --git a/composer.json b/composer.json
@@ -118,7 +118,7 @@
         "predis/predis": "~1.1",
         "psr/http-client": "^1.0",
         "psr/simple-cache": "^1.0",
-        "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
+        "egulias/email-validator": "^1.2.8|^2|^3",
         "symfony/phpunit-bridge": "^5.2",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -21,7 +21,7 @@
         "twig/twig": "^1.41|^2.10|^3.0"
     },
     "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/composer.json b/src/Symfony/Component/Mime/composer.json
@@ -21,7 +21,7 @@
         "symfony/polyfill-mbstring": "^1.0"
     },
     "require-dev": {
-        "egulias/email-validator": "^2.1.10",
+        "egulias/email-validator": "^2.1.10|^3",
         "symfony/dependency-injection": "^3.4|^4.1|^5.0"
     },
     "conflict": {
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -108,7 +108,7 @@ public function validate($value, Constraint $constraint)
 
         if (Email::VALIDATION_MODE_STRICT === $constraint->mode) {
             if (!class_exists('\Egulias\EmailValidator\EmailValidator')) {
-                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 \Egulias\EmailValidator\EmailValidator();
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -34,7 +34,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();
     }
@@ -210,7 +210,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();
     }
@@ -255,7 +255,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.7",
         "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
`@@ -108,7 +108,7 @@ public function validate($value, Constraint $constraint)`
`108`	`108`
`109`	`109`	`if (Email::VALIDATION_MODE_STRICT === $constraint->mode) {`
`110`	`110`	`if (!class_exists('\Egulias\EmailValidator\EmailValidator')) {`
`111`		`- throw new LogicException('Strict email validation requires egulias/email-validator ~1.2\|~2.0.');`
	`111`	`+ throw new LogicException('Strict email validation requires egulias/email-validator ^2.1.10\|^3.');`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`$strictValidator = new \Egulias\EmailValidator\EmailValidator();`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function testLegacyValidatorConstructorStrict()`
`34`	`34`	`{`
`35`	`35`	`$this->validator = new EmailValidator(true);`
`36`	`36`	`$this->validator->initialize($this->context);`
`37`		`- $this->validator->validate('example@localhost', new Email());`
	`37`	`+ $this->validator->validate('example@mywebsite.tld', new Email());`
`38`	`38`
`39`	`39`	`$this->assertNoViolation();`
`40`	`40`	`}`
`@@ -210,7 +210,7 @@ public function testModeStrict()`
`210`	`210`	`{`
`211`	`211`	`$constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]);`
`212`	`212`
`213`		`- $this->validator->validate('example@localhost', $constraint);`
	`213`	`+ $this->validator->validate('example@mywebsite.tld', $constraint);`
`214`	`214`
`215`	`215`	`$this->assertNoViolation();`
`216`	`216`	`}`
`@@ -255,7 +255,7 @@ public function testStrict()`
`255`	`255`	`{`
`256`	`256`	`$constraint = new Email(['strict' => true]);`
`257`	`257`
`258`		`- $this->validator->validate('example@localhost', $constraint);`
	`258`	`+ $this->validator->validate('example@mywebsite.tld', $constraint);`
`259`	`259`
`260`	`260`	`$this->assertNoViolation();`
`261`	`261`	`}`