Improved Bootstrap form theme for hidden fields

javiereguiluz · fabpot · commit ba5d7f99e99c · 2016-03-01T08:14:36.000+01:00
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
@@ -664,7 +664,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"]
     ]
 '
         );
@@ -701,7 +701,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"]
     ]
 '
         );
@@ -740,7 +740,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"]
     ]
 '
         );
@@ -786,7 +786,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"]
     ]
 '
         );
@@ -822,7 +822,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"]
     ]
 '
         );
@@ -868,7 +868,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"]
     ]
 '
         );
@@ -915,7 +915,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"]
     ]
 '
         );
@@ -964,7 +964,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"]
     ]
 '
         );
@@ -1466,7 +1466,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
`@@ -664,7 +664,7 @@ public function testSingleChoiceExpanded()`
`664`	`664`	`./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]`
`665`	`665`	`]`
`666`	`666`	`]`
`667`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`667`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`668`	`668`	`]`
`669`	`669`	`'`
`670`	`670`	`);`
`@@ -701,7 +701,7 @@ public function testSingleChoiceExpandedWithoutTranslation()`
`701`	`701`	`./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]`
`702`	`702`	`]`
`703`	`703`	`]`
`704`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`704`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`705`	`705`	`]`
`706`	`706`	`'`
`707`	`707`	`);`
`@@ -740,7 +740,7 @@ public function testSingleChoiceExpandedAttributes()`
`740`	`740`	`./input[@type="radio"][@name="name"][@id="name_1"][@value="&b"][not(@checked)]'.$classPart.'`
`741`	`741`	`]`
`742`	`742`	`]`
`743`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`743`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`744`	`744`	`]`
`745`	`745`	`'`
`746`	`746`	`);`
`@@ -786,7 +786,7 @@ public function testSingleChoiceExpandedWithPlaceholder()`
`786`	`786`	`./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]`
`787`	`787`	`]`
`788`	`788`	`]`
`789`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`789`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`790`	`790`	`]`
`791`	`791`	`'`
`792`	`792`	`);`
`@@ -822,7 +822,7 @@ public function testSingleChoiceExpandedWithBooleanValue()`
`822`	`822`	`./input[@type="radio"][@name="name"][@id="name_1"][not(@checked)]`
`823`	`823`	`]`
`824`	`824`	`]`
`825`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`825`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`826`	`826`	`]`
`827`	`827`	`'`
`828`	`828`	`);`
`@@ -868,7 +868,7 @@ public function testMultipleChoiceExpanded()`
`868`	`868`	`./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]`
`869`	`869`	`]`
`870`	`870`	`]`
`871`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`871`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`872`	`872`	`]`
`873`	`873`	`'`
`874`	`874`	`);`
`@@ -915,7 +915,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()`
`915`	`915`	`./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]`
`916`	`916`	`]`
`917`	`917`	`]`
`918`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`918`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`919`	`919`	`]`
`920`	`920`	`'`
`921`	`921`	`);`
`@@ -964,7 +964,7 @@ public function testMultipleChoiceExpandedAttributes()`
`964`	`964`	`./input[@type="checkbox"][@name="name[]"][@id="name_2"][@checked][not(@required)]`
`965`	`965`	`]`
`966`	`966`	`]`
`967`		`- /following-sibling::input[@type="hidden"][@id="name__token"][@class="form-control"]`
	`967`	`+ /following-sibling::input[@type="hidden"][@id="name__token"]`
`968`	`968`	`]`
`969`	`969`	`'`
`970`	`970`	`);`
`@@ -1466,7 +1466,7 @@ public function testHidden()`
`1466`	`1466`	`'/input`
`1467`	`1467`	`[@type="hidden"]`
`1468`	`1468`	`[@name="name"]`
`1469`		`- [@class="my&class form-control"]`
	`1469`	`+ [@class="my&class"]`
`1470`	`1470`	`[@value="foo&bar"]`
`1471`	`1471`	`'`
`1472`	`1472`	`);`