symfony
diff --git a/‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
Lines changed: 5 additions & 3 deletions b/‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
Lines changed: 5 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Form/FormFactory.php
Lines changed: 7 additions & 1 deletion b/‎src/Symfony/Component/Form/FormFactory.php
Lines changed: 7 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/FormFactoryTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/Tests/FormFactoryTest.php
Lines changed: 2 additions & 2 deletions
@@ -14,13 +14,15 @@
 use Symfony\Bridge\Twig\Node\TransNode;
 use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;
 use Twig\Environment;
+use Twig\Node\BlockNode;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\AssignNameExpression;
 use Twig\Node\Expression\ConstantExpression;
 use Twig\Node\Expression\FilterExpression;
 use Twig\Node\Expression\NameExpression;
 use Twig\Node\ModuleNode;
 use Twig\Node\Node;
+use Twig\Node\SetNode;
 use Twig\NodeVisitor\AbstractNodeVisitor;
 
 /**
@@ -48,7 +50,7 @@ public function __construct()
      */
     protected function doEnterNode(Node $node, Environment $env)
     {
-        if ($node instanceof Node_Block || $node instanceof ModuleNode) {
+        if ($node instanceof BlockNode || $node instanceof ModuleNode) {
             $this->scope = $this->scope->enter();
         }
 
@@ -62,7 +64,7 @@ protected function doEnterNode(Node $node, Environment $env)
                 $name = new AssignNameExpression($var, $node->getTemplateLine());
                 $this->scope->set('domain', new NameExpression($var, $node->getTemplateLine()));
 
-                return new Node_Set(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());
+                return new SetNode(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());
             }
         }
 
@@ -104,7 +106,7 @@ protected function doLeaveNode(Node $node, Environment $env)
             return false;
         }
 
-        if ($node instanceof Node_Block || $node instanceof ModuleNode) {
+        if ($node instanceof BlockNode || $node instanceof ModuleNode) {
             $this->scope = $this->scope->leave();
         }
 
 
@@ -153,7 +153,13 @@ public function createBuilderForProperty($class, $property, $data = null, array
 
         // user options may override guessed options
         if ($typeGuess) {
-            $options = array_merge($typeGuess->getOptions(), $options);
+            $attrs = array();
+            $typeGuessOptions = $typeGuess->getOptions();
+            if (isset($typeGuessOptions['attr']) && isset($options['attr'])) {
+                $attrs = array('attr' => array_merge($typeGuessOptions['attr'], $options['attr']));
+            }
+
+            $options = array_merge($typeGuessOptions, $options, $attrs);
         }
 
         return $this->createNamedBuilder($property, $type, $data, $options);
 
@@ -686,15 +686,15 @@ public function testOptionsCanBeOverridden()
             ->with('Application\Author', 'firstName')
             ->will($this->returnValue(new TypeGuess(
                 'Symfony\Component\Form\Extension\Core\Type\TextType',
-                array('attr' => array('maxlength' => 10)),
+                array('attr' => array('class' => 'foo', 'maxlength' => 10)),
                 Guess::MEDIUM_CONFIDENCE
             )));
 
         $factory = $this->getMockFactory(array('createNamedBuilder'));
 
         $factory->expects($this->once())
             ->method('createNamedBuilder')
-            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array('attr' => array('maxlength' => 11)))
+            ->with('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType', null, array('attr' => array('class' => 'foo', 'maxlength' => 11)))
             ->will($this->returnValue('builderInstance'));
 
         $this->builder = $factory->createBuilderForProperty(
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,15 @@`
`14`	`14`	`use Symfony\Bridge\Twig\Node\TransNode;`
`15`	`15`	`use Symfony\Bridge\Twig\Node\TransDefaultDomainNode;`
`16`	`16`	`use Twig\Environment;`
	`17`	`+use Twig\Node\BlockNode;`
`17`	`18`	`use Twig\Node\Expression\ArrayExpression;`
`18`	`19`	`use Twig\Node\Expression\AssignNameExpression;`
`19`	`20`	`use Twig\Node\Expression\ConstantExpression;`
`20`	`21`	`use Twig\Node\Expression\FilterExpression;`
`21`	`22`	`use Twig\Node\Expression\NameExpression;`
`22`	`23`	`use Twig\Node\ModuleNode;`
`23`	`24`	`use Twig\Node\Node;`
	`25`	`+use Twig\Node\SetNode;`
24	`26`	`use Twig\NodeVisitor\AbstractNodeVisitor;`
`25`	`27`
`26`	`28`	`/**`
`@@ -48,7 +50,7 @@ public function __construct()`
`48`	`50`	`*/`
`49`	`51`	`protected function doEnterNode(Node $node, Environment $env)`
`50`	`52`	`{`
`51`		`- if ($node instanceof Node_Block \|\| $node instanceof ModuleNode) {`
	`53`	`+ if ($node instanceof BlockNode \|\| $node instanceof ModuleNode) {`
`52`	`54`	`$this->scope = $this->scope->enter();`
`53`	`55`	`}`
`54`	`56`
`@@ -62,7 +64,7 @@ protected function doEnterNode(Node $node, Environment $env)`
`62`	`64`	`$name = new AssignNameExpression($var, $node->getTemplateLine());`
`63`	`65`	`$this->scope->set('domain', new NameExpression($var, $node->getTemplateLine()));`
`64`	`66`
`65`		`- return new Node_Set(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());`
	`67`	`+ return new SetNode(false, new Node(array($name)), new Node(array($node->getNode('expr'))), $node->getTemplateLine());`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`
`@@ -104,7 +106,7 @@ protected function doLeaveNode(Node $node, Environment $env)`
`104`	`106`	`return false;`
`105`	`107`	`}`
`106`	`108`
`107`		`- if ($node instanceof Node_Block \|\| $node instanceof ModuleNode) {`
	`109`	`+ if ($node instanceof BlockNode \|\| $node instanceof ModuleNode) {`
`108`	`110`	`$this->scope = $this->scope->leave();`
`109`	`111`	`}`
`110`	`112`