[Form] render hidden empty inputs for checkboxes

xabbuh · xabbuh · commit 71db87e3ca78 · 2016-10-12T22:27:41.000+02:00
This ensures that a form is always considered submitted even if it
contains only checkboxes which all haven't been checked by the user.
diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
@@ -85,7 +85,7 @@
 {%- endblock choice_widget_options -%}
 
 {%- block checkbox_widget -%}
-    <input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
+    <input type="hidden" name="{{ full_name }}" /><input type="checkbox" {{ block('widget_attributes') }}{% if value is defined %} value="{{ value }}"{% endif %}{% if checked %} checked="checked"{% endif %} />
 {%- endblock checkbox_widget -%}
 
 {%- block radio_widget -%}
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.11|~2.8.4",
+        "symfony/form": "~2.7.20|~2.8.13",
         "symfony/http-kernel": "~2.3",
         "symfony/intl": "~2.3",
         "symfony/routing": "~2.2",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/checkbox_widget.html.php
@@ -1,4 +1,4 @@
-<input type="checkbox"
+<input type="hidden" name="<?php echo $view->escape($full_name) ?>" /><input type="checkbox"
     <?php echo $view['form']->block($form, 'widget_attributes') ?>
     <?php if (strlen($value) > 0): ?> value="<?php echo $view->escape($value) ?>"<?php endif ?>
     <?php if ($checked): ?> checked="checked"<?php endif ?>
diff --git a/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php
@@ -805,7 +805,7 @@ public function testMultipleChoiceExpandedWithLabelsAsFalse()
         /following-sibling::input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
         /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
-    [count(./input)=3]
+    [count(./input)=5]
     [count(./label)=1]
 '
         );
@@ -837,7 +837,7 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()
         /following-sibling::label[@for="name_2"][.="[trans]label.&c[/trans]"]
         /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
-    [count(./input)=4]
+    [count(./input)=7]
     [count(./label)=3]
 '
         );
@@ -862,7 +862,7 @@ public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()
         /following-sibling::input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]
         /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
-    [count(./input)=3]
+    [count(./input)=5]
     [count(./label)=1]
 '
         );
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -1133,7 +1133,7 @@ public function testMultipleChoiceExpanded()
         /following-sibling::label[@for="name_2"][.="[trans]Choice&C[/trans]"]
         /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
-    [count(./input)=4]
+    [count(./input)=7]
 '
         );
     }
@@ -1160,7 +1160,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()
         /following-sibling::label[@for="name_2"][.="Choice&C"]
         /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
-    [count(./input)=4]
+    [count(./input)=7]
 '
         );
     }
@@ -1189,7 +1189,7 @@ public function testMultipleChoiceExpandedAttributes()
         /following-sibling::label[@for="name_2"][.="[trans]Choice&C[/trans]"]
         /following-sibling::input[@type="hidden"][@id="name__token"]
     ]
-    [count(./input)=4]
+    [count(./input)=7]
 '
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<input type="checkbox"`
	`1`	`+<input type="hidden" name="<?php echo $view->escape($full_name) ?>" /><input type="checkbox"`
`2`	`2`	`<?php echo $view['form']->block($form, 'widget_attributes') ?>`
`3`	`3`	`<?php if (strlen($value) > 0): ?> value="<?php echo $view->escape($value) ?>"<?php endif ?>`
`4`	`4`	`<?php if ($checked): ?> checked="checked"<?php endif ?>`
Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ public function testMultipleChoiceExpandedWithLabelsAsFalse()`
`805`	`805`	`/following-sibling::input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]`
`806`	`806`	`/following-sibling::input[@type="hidden"][@id="name__token"]`
`807`	`807`	`]`
`808`		`- [count(./input)=3]`
	`808`	`+ [count(./input)=5]`
`809`	`809`	`[count(./label)=1]`
`810`	`810`	`'`
`811`	`811`	`);`
`@@ -837,7 +837,7 @@ public function testMultipleChoiceExpandedWithLabelsSetByCallable()`
`837`	`837`	`/following-sibling::label[@for="name_2"][.="[trans]label.&c[/trans]"]`
`838`	`838`	`/following-sibling::input[@type="hidden"][@id="name__token"]`
`839`	`839`	`]`
`840`		`- [count(./input)=4]`
	`840`	`+ [count(./input)=7]`
`841`	`841`	`[count(./label)=3]`
`842`	`842`	`'`
`843`	`843`	`);`
`@@ -862,7 +862,7 @@ public function testMultipleChoiceExpandedWithLabelsSetFalseByCallable()`
`862`	`862`	`/following-sibling::input[@type="checkbox"][@name="name[]"][@id="name_1"][@value="&b"][not(@checked)]`
`863`	`863`	`/following-sibling::input[@type="hidden"][@id="name__token"]`
`864`	`864`	`]`
`865`		`- [count(./input)=3]`
	`865`	`+ [count(./input)=5]`
`866`	`866`	`[count(./label)=1]`
`867`	`867`	`'`
`868`	`868`	`);`
Original file line number	Diff line number	Diff line change
`@@ -1133,7 +1133,7 @@ public function testMultipleChoiceExpanded()`
`1133`	`1133`	`/following-sibling::label[@for="name_2"][.="[trans]Choice&C[/trans]"]`
`1134`	`1134`	`/following-sibling::input[@type="hidden"][@id="name__token"]`
`1135`	`1135`	`]`
`1136`		`- [count(./input)=4]`
	`1136`	`+ [count(./input)=7]`
`1137`	`1137`	`'`
`1138`	`1138`	`);`
`1139`	`1139`	`}`
`@@ -1160,7 +1160,7 @@ public function testMultipleChoiceExpandedWithoutTranslation()`
`1160`	`1160`	`/following-sibling::label[@for="name_2"][.="Choice&C"]`
`1161`	`1161`	`/following-sibling::input[@type="hidden"][@id="name__token"]`
`1162`	`1162`	`]`
`1163`		`- [count(./input)=4]`
	`1163`	`+ [count(./input)=7]`
`1164`	`1164`	`'`
`1165`	`1165`	`);`
`1166`	`1166`	`}`
`@@ -1189,7 +1189,7 @@ public function testMultipleChoiceExpandedAttributes()`
`1189`	`1189`	`/following-sibling::label[@for="name_2"][.="[trans]Choice&C[/trans]"]`
`1190`	`1190`	`/following-sibling::input[@type="hidden"][@id="name__token"]`
`1191`	`1191`	`]`
`1192`		`- [count(./input)=4]`
	`1192`	`+ [count(./input)=7]`
`1193`	`1193`	`'`
`1194`	`1194`	`);`
`1195`	`1195`	`}`