Merge remote branch 'mweimerskirch/master'

src/Symfony/Bundle/TwigBundle/TokenParser/TransChoiceTokenParser.php

@@ -55,7 +55,7 @@ class TransChoiceTokenParser extends TransTokenParser
         $body = $this->parser->subparse(array($this, 'decideTransChoiceFork'), true);
 
         if (!$body instanceof \Twig_Node_Text && !$body instanceof \Twig_Node_Expression) {
-            throw new \Twig_Error_Syntax('A message must be a simple text', -1);
+            throw new \Twig_Error_Syntax(sprintf('A message must be a simple text (line %s)', $lineno), -1);
         }
 
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);

src/Symfony/Component/Validator/Constraints/EmailValidator.php

@@ -17,7 +17,6 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 class EmailValidator extends ConstraintValidator
 {
-    const PATTERN = '/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i';
 
     public function isValid($value, Constraint $constraint)
     {
@@ -31,7 +30,7 @@ class EmailValidator extends ConstraintValidator
 
         $value = (string)$value;
 
-        if (!preg_match(self::PATTERN, $value)) {
+        if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
             $this->setMessage($constraint->message, array('{{ value }}' => $value));
 
             return false;