bug #22936 [Form] Mix attr option between guessed options and user options (yceruto)

fabpot · fabpot · commit 621b7698fb9d · 2017-06-03T08:53:19.000-07:00
This PR was merged into the 2.7 branch. Discussion ---------- [Form] Mix attr option between guessed options and user options | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19871 | License | MIT Commits ------- 84f5de9 mix attr options between type-guess options and user options
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_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);
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -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(
