minor #19147 [Validator] explicitly forbid e-mail validator 2.0 or higher (xabbuh)

fabpot · fabpot · commit 989f82170314 · 2016-06-23T07:20:59.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [Validator] explicitly forbid e-mail validator 2.0 or higher | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 81a6d8e explicitly forbid e-mail validator 2.0 or higher
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -56,8 +56,8 @@ public function validate($value, Constraint $constraint)
         }
 
         if ($constraint->strict) {
-            if (!class_exists('\Egulias\EmailValidator\EmailValidator')) {
-                throw new RuntimeException('Strict email validation requires egulias/email-validator');
+            if (!class_exists('\Egulias\EmailValidator\EmailValidator') || interface_exists('\Egulias\EmailValidator\Validation\EmailValidation')) {
+                throw new RuntimeException('Strict email validation requires egulias/email-validator:~1.2');
             }
 
             $strictValidator = new \Egulias\EmailValidator\EmailValidator();

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ public function validate($value, Constraint $constraint)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if ($constraint->strict) {`
`59`		`- if (!class_exists('\Egulias\EmailValidator\EmailValidator')) {`
`60`		`- throw new RuntimeException('Strict email validation requires egulias/email-validator');`
	`59`	`+ if (!class_exists('\Egulias\EmailValidator\EmailValidator') \|\| interface_exists('\Egulias\EmailValidator\Validation\EmailValidation')) {`
	`60`	`+ throw new RuntimeException('Strict email validation requires egulias/email-validator:~1.2');`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`$strictValidator = new \Egulias\EmailValidator\EmailValidator();`