bug #17568 Improved Bootstrap form theme for hidden fields (javiereguiluz)

fabpot · fabpot · commit df4cc4008238 · 2016-03-01T08:14:37.000+01:00
This PR was squashed before being merged into the 2.7 branch (closes #17568). Discussion ---------- Improved Bootstrap form theme for hidden fields | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #16925 | License | MIT | Doc PR | - Commits ------- ba5d7f9 Improved Bootstrap form theme for hidden fields
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig
@@ -3,7 +3,7 @@
 {# Widgets #}
 
 {% block form_widget_simple -%}
-    {% if type is not defined or 'file' != type %}
+    {% if type is not defined or type not in ['file', 'hidden'] %}
         {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control')|trim}) -%}
     {% endif %}
     {{- parent() -}}
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -22,7 +22,7 @@
     "require-dev": {
         "symfony/asset": "~2.7",
         "symfony/finder": "~2.3",
-        "symfony/form": "~2.7,>=2.7.8",
+        "symfony/form": "~2.7.10|~2.8.3",
         "symfony/http-kernel": "~2.3",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
diff --git a/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
@@ -684,7 +684,7 @@ public function testSingleChoiceExpanded()
                         ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -844,7 +844,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
                         ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -883,7 +883,7 @@ public function testSingleChoiceExpandedAttributes()
                         ./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -930,7 +930,7 @@ public function testSingleChoiceExpandedWithPlaceholder()
                         ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -966,7 +966,7 @@ public function testSingleChoiceExpandedWithBooleanValue()
                         ./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -1012,7 +1012,7 @@ public function testMultipleChoiceExpanded()
                         ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -1182,7 +1182,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
                         ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -1231,7 +1231,7 @@ public function testMultipleChoiceExpandedAttributes()
                         ./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]
                     ]
             ]
-        /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]
+        /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
 '
         );
@@ -1733,7 +1733,7 @@ public function testHidden()
 '/input
     [@type="hidden"]
     [@name="name"]
-    [@class="my&class form-control"]
+    [@class="my&class"]
     [@value="foo&bar"]
 '
         );

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ public function testSingleChoiceExpanded()`
`684`	`684`	`./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]`
`685`	`685`	`]`
`686`	`686`	`]`
`687`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`687`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`688`	`688`	`]`
`689`	`689`	`'`
`690`	`690`	`);`
`@@ -844,7 +844,7 @@ public function testSingleChoiceExpandedWithoutTranslation()`
`844`	`844`	`./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]`
`845`	`845`	`]`
`846`	`846`	`]`
`847`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`847`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`848`	`848`	`]`
`849`	`849`	`'`
`850`	`850`	`);`
`@@ -883,7 +883,7 @@ public function testSingleChoiceExpandedAttributes()`
`883`	`883`	`./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'`
`884`	`884`	`]`
`885`	`885`	`]`
`886`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`886`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`887`	`887`	`]`
`888`	`888`	`'`
`889`	`889`	`);`
`@@ -930,7 +930,7 @@ public function testSingleChoiceExpandedWithPlaceholder()`
`930`	`930`	`./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]`
`931`	`931`	`]`
`932`	`932`	`]`
`933`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`933`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`934`	`934`	`]`
`935`	`935`	`'`
`936`	`936`	`);`
`@@ -966,7 +966,7 @@ public function testSingleChoiceExpandedWithBooleanValue()`
`966`	`966`	`./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]`
`967`	`967`	`]`
`968`	`968`	`]`
`969`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`969`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`970`	`970`	`]`
`971`	`971`	`'`
`972`	`972`	`);`
`@@ -1012,7 +1012,7 @@ public function testMultipleChoiceExpanded()`
`1012`	`1012`	`./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]`
`1013`	`1013`	`]`
`1014`	`1014`	`]`
`1015`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`1015`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`1016`	`1016`	`]`
`1017`	`1017`	`'`
`1018`	`1018`	`);`
`@@ -1182,7 +1182,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()`
`1182`	`1182`	`./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]`
`1183`	`1183`	`]`
`1184`	`1184`	`]`
`1185`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`1185`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`1186`	`1186`	`]`
`1187`	`1187`	`'`
`1188`	`1188`	`);`
`@@ -1231,7 +1231,7 @@ public function testMultipleChoiceExpandedAttributes()`
`1231`	`1231`	`./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]`
`1232`	`1232`	`]`
`1233`	`1233`	`]`
`1234`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`1234`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`1235`	`1235`	`]`
`1236`	`1236`	`'`
`1237`	`1237`	`);`
`@@ -1733,7 +1733,7 @@ public function testHidden()`
`1733`	`1733`	`'/input`
`1734`	`1734`	`[@type="hidden"]`
`1735`	`1735`	`[@name="name"]`
`1736`		`- [@class="my&class form-control"]`
	`1736`	`+ [@class="my&class"]`
`1737`	`1737`	`[@value="foo&bar"]`
`1738`	`1738`	`'`
`1739`	`1739`	`);`