Merge branch '2.4'

* 2.4:
  fixed CS
  allow the TextAreaFormField to be used with valid/invalid HTML
  Create security.id.xlf
  [DependencyInjection] Remove unneeded file
  [Twig] removed obsolete conditions on Twig versions
  added lines to exceptions for the trans and transchoice tags
  [FrameworkBundle] Merged multiple line input into one line to fix the tests.
  [Form] Make FormInterface::add docblock more explicit
  [Security] Add zh_CN translations
  Routing condition bugfix
  [Validator][Translation]update zh_CN translations
  [Validator] Minor fix in XmlLoader

Author: fabpot

src/Symfony/Bridge/Twig/Node/TransNode.php

@@ -95,22 +95,10 @@ protected function compileString(\Twig_NodeInterface $body, \Twig_Node_Expressio
 
         preg_match_all('/(?<!%)%([^%]+)%/', $msg, $matches);
 
-        if (version_compare(\Twig_Environment::VERSION, '1.5', '>=')) {
-            foreach ($matches[1] as $var) {
-                $key = new \Twig_Node_Expression_Constant('%'.$var.'%', $body->getLine());
-                if (!$vars->hasElement($key)) {
-                    $vars->addElement(new \Twig_Node_Expression_Name($var, $body->getLine()), $key);
-                }
-            }
-        } else {
-            $current = array();
-            foreach ($vars as $name => $var) {
-                $current[$name] = true;
-            }
-            foreach ($matches[1] as $var) {
-                if (!isset($current['%'.$var.'%'])) {
-                    $vars->setNode('%'.$var.'%', new \Twig_Node_Expression_Name($var, $body->getLine()));
-                }
+        foreach ($matches[1] as $var) {
+            $key = new \Twig_Node_Expression_Constant('%'.$var.'%', $body->getLine());
+            if (!$vars->hasElement($key)) {
+                $vars->addElement(new \Twig_Node_Expression_Name($var, $body->getLine()), $key);
             }
         }
 

src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php

@@ -43,6 +43,33 @@ public function testTrans($template, $expected, array $variables = array())
         $this->assertEquals($expected, $this->getTemplate($template)->render($variables));
     }
 
+    /**
+     * @expectedException        \Twig_Error_Syntax
+     * @expectedExceptionMessage Unexpected token. Twig was looking for the "with", "from", or "into" keyword in "index" at line 3.
+     */
+    public function testTransUnknownKeyword()
+    {
+        $output = $this->getTemplate("{% trans \n\nfoo %}{% endtrans %}")->render();
+    }
+
+    /**
+     * @expectedException        \Twig_Error_Syntax
+     * @expectedExceptionMessage A message inside a trans tag must be a simple text in "index" at line 2.
+     */
+    public function testTransComplexBody()
+    {
+        $output = $this->getTemplate("{% trans %}\n{{ 1 + 2 }}{% endtrans %}")->render();
+    }
+
+    /**
+     * @expectedException        \Twig_Error_Syntax
+     * @expectedExceptionMessage A message inside a transchoice tag must be a simple text in "index" at line 2.
+     */
+    public function testTransChoiceComplexBody()
+    {
+        $output = $this->getTemplate("{% transchoice count %}\n{{ 1 + 2 }}{% endtranschoice %}")->render();
+    }
+
     public function getTransTests()
     {
         return array(

src/Symfony/Bridge/Twig/TokenParser/TransChoiceTokenParser.php

@@ -64,7 +64,7 @@ public function parse(\Twig_Token $token)
         $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.');
+            throw new \Twig_Error_Syntax('A message inside a transchoice tag must be a simple text.', $body->getLine(), $stream->getFilename());
         }
 
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);

src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php

@@ -55,7 +55,7 @@ public function parse(\Twig_Token $token)
                 $stream->next();
                 $locale =  $this->parser->getExpressionParser()->parseExpression();
             } elseif (!$stream->test(\Twig_Token::BLOCK_END_TYPE)) {
-                throw new \Twig_Error_Syntax('Unexpected token. Twig was looking for the "with" or "from" keyword.');
+                throw new \Twig_Error_Syntax('Unexpected token. Twig was looking for the "with", "from", or "into" keyword.', $stream->getCurrent()->getLine(), $stream->getFilename());
             }
         }
 
@@ -64,7 +64,7 @@ public function parse(\Twig_Token $token)
         $body = $this->parser->subparse(array($this, 'decideTransFork'), true);
 
         if (!$body instanceof \Twig_Node_Text && !$body instanceof \Twig_Node_Expression) {
-            throw new \Twig_Error_Syntax('A message inside a trans tag must be a simple text');
+            throw new \Twig_Error_Syntax('A message inside a trans tag must be a simple text.', $body->getLine(), $stream->getFilename());
         }
 
         $stream->expect(\Twig_Token::BLOCK_END_TYPE);

src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php

@@ -1,5 +1 @@
-<input
-    type="<?php echo isset($type) ? $view->escape($type) : 'text' ?>"
-    <?php echo $view['form']->block($form, 'widget_attributes') ?>
-    <?php if (!empty($value) || is_numeric($value)): ?> value="<?php echo $view->escape($value) ?>"<?php endif ?>
-/>
+<input type="<?php echo isset($type) ? $view->escape($type) : 'text' ?>" <?php echo $view['form']->block($form, 'widget_attributes') ?><?php if (!empty($value) || is_numeric($value)): ?> value="<?php echo $view->escape($value) ?>"<?php endif ?> />

src/Symfony/Component/DependencyInjection/services10.xml

@@ -33,7 +33,7 @@ protected function initialize()
 
         $this->value = null;
         foreach ($this->node->childNodes as $node) {
-            $this->value .= $this->document->saveXML($node);
+            $this->value .= $node->wholeText;
         }
     }
 }

src/Symfony/Component/DomCrawler/Field/TextareaFormField.php

@@ -29,5 +29,18 @@ public function testInitialize()
         } catch (\LogicException $e) {
             $this->assertTrue(true, '->initialize() throws a \LogicException if the node is not a textarea');
         }
+
+        // Ensure that valid HTML can be used on a textarea.
+        $node = $this->createNode('textarea', 'foo bar <h1>Baz</h1>');
+        $field = new TextareaFormField($node);
+
+        $this->assertEquals('foo bar <h1>Baz</h1>', $field->getValue(), '->initialize() sets the value of the field to the textarea node value');
+
+        // Ensure that we don't do any DOM manipulation/validation by passing in
+        // "invalid" HTML.
+        $node = $this->createNode('textarea', 'foo bar <h1>Baz</h2>');
+        $field = new TextareaFormField($node);
+
+        $this->assertEquals('foo bar <h1>Baz</h2>', $field->getValue(), '->initialize() sets the value of the field to the textarea node value');
     }
 }

src/Symfony/Component/DomCrawler/Tests/Field/TextareaFormFieldTest.php

@@ -39,7 +39,7 @@ public function setParent(FormInterface $parent = null);
     public function getParent();
 
     /**
-     * Adds a child to the form.
+     * Adds or replaces a child to the form.
      *
      * @param FormInterface|string|integer $child   The FormInterface instance or the name of the child.
      * @param string|null                  $type    The child's type, if a name was passed.

src/Symfony/Component/Form/FormInterface.php

@@ -167,6 +167,9 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, $
         if (null !== $host) {
             $subCollection->setHost($host);
         }
+        if (null !== $condition) {
+            $subCollection->setCondition($condition);
+        }
         if (null !== $schemes) {
             $subCollection->setSchemes($schemes);
         }