symfony#1581 - Soft dependency with version

egulias · egulias · commit ab3787accf8b · 2014-01-12T18:20:39.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/validation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/validation.xml
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Egulias\EmailValidator\EmailValidator as StrictEmailValidator;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -38,7 +39,7 @@ public function validate($value, Constraint $constraint)
         $value = (string) $value;
 
         if ($constraint->strict === true && class_exists('\Egulias\EmailValidator\EmailValidator')) {
-            $strictValidator = new \Egulias\EmailValidator\EmailValidator();
+            $strictValidator = new StrictEmailValidator();
             $valid = $strictValidator->isValid($value, $constraint->checkMX);
         } elseif ($constraint->strict === true) {
             throw new \RuntimeException('Strict email validation requires egulias/email-validator');
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -19,7 +19,6 @@
         "php": ">=5.3.3",
         "symfony/translation": "~2.0",
         "symfony/property-access": "~2.2"
-        "egulias/email-validator": "dev-master"
     },
     "require-dev": {
         "symfony/http-foundation": "~2.1",
@@ -28,14 +27,16 @@
         "symfony/config": "~2.2",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0"
+        "egulias/email-validator": "~1.0"
     },
     "suggest": {
         "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
         "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
         "symfony/http-foundation": "",
         "symfony/intl": "",
         "symfony/yaml": "",
-        "symfony/config": ""
+        "symfony/config": "",
+        "egulias/email-validator": "Strict (RFC compilant) email validation"
     },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Validator\\": "" }
