symfony
diff --git a/‎src/Symfony/Component/Form/FormFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/FormFactory.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Form/FormFactory.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/FormFactory.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Form/Tests/FormFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/FormFactoryTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Form/Tests/FormFactoryTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/FormFactoryTest.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -126,7 +126,7 @@ public function createBuilderForProperty($class, $property, $data = null, array
 
         // user options may override guessed options
         if ($typeGuess) {
-            $options = array_merge($typeGuess->getOptions(), $options);
+            $options = array_replace_recursive($typeGuess->getOptions(), $options);
         }
 
         return $this->createNamedBuilder($property, $type, $data, $options);
 
@@ -450,15 +450,15 @@ public function testOptionsCanBeOverridden()
                 ->with('Application\Author', 'firstName')
                 ->will($this->returnValue(new TypeGuess(
                     'text',
-                    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', 'text', null, array('attr' => array('maxlength' => 11)))
+            ->with('firstName', 'text', 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
`@@ -126,7 +126,7 @@ public function createBuilderForProperty($class, $property, $data = null, array`
`126`	`126`
`127`	`127`	`// user options may override guessed options`
`128`	`128`	`if ($typeGuess) {`
`129`		`- $options = array_merge($typeGuess->getOptions(), $options);`
	`129`	`+ $options = array_replace_recursive($typeGuess->getOptions(), $options);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`return $this->createNamedBuilder($property, $type, $data, $options);`