Merge branch '4.4' into 5.2

derrabus · derrabus · commit adc4d385b056 · 2021-03-07T17:08:20.000+01:00
* 4.4:
  Allow egulias/email-validator 3.x
diff --git a/Tests/Constraints/EmailValidatorTest.php b/Tests/Constraints/EmailValidatorTest.php
@@ -197,7 +197,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();
     }
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "symfony/translation": "^4.4|^5.0",
         "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
`@@ -197,7 +197,7 @@ public function testModeStrict()`
`197`	`197`	`{`
`198`	`198`	`$constraint = new Email(['mode' => Email::VALIDATION_MODE_STRICT]);`
`199`	`199`
`200`		`- $this->validator->validate('example@localhost', $constraint);`
	`200`	`+ $this->validator->validate('example@mywebsite.tld', $constraint);`
`201`	`201`
`202`	`202`	`$this->assertNoViolation();`
`203`	`203`	`}`