merge attr options only

yceruto · yceruto · commit d239328c9b93 · 2017-05-29T12:00:18.000-04:00
diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php
@@ -126,7 +126,13 @@ public function createBuilderForProperty($class, $property, $data = null, array
 
         // user options may override guessed options
         if ($typeGuess) {
-            $options = array_replace_recursive($typeGuess->getOptions(), $options);
+            $attrOptions = array();
+            $typeGuessOptions = $typeGuess->getOptions();
+            if (isset($typeGuessOptions['attr']) && isset($options['attr'])) {
+                $attrOptions = array('attr' => array_merge($typeGuessOptions['attr'], $options['attr']));
+            }
+
+            $options = array_merge($typeGuessOptions, $options, $attrOptions);
         }
 
         return $this->createNamedBuilder($property, $type, $data, $options);
