DefaultFormRenderer, Latte: fix input name defined like array (#182)

Author: h4kuna

src/Bridges/FormsLatte/Runtime.php

@@ -52,7 +52,8 @@ public static function renderFormEnd(Form $form, bool $withTags = true): string
 			foreach (preg_split('#[;&]#', (string) parse_url($form->getElementPrototype()->action, PHP_URL_QUERY), -1, PREG_SPLIT_NO_EMPTY) as $param) {
 				$parts = explode('=', $param, 2);
 				$name = urldecode($parts[0]);
-				if (!isset($form[$name])) {
+				$prefix = explode('[', $name, 2)[0];
+				if (!isset($form[$prefix])) {
 					$s .= Html::el('input', ['type' => 'hidden', 'name' => $name, 'value' => urldecode($parts[1])]);
 				}
 			}

src/Forms/Rendering/DefaultFormRenderer.php

@@ -172,7 +172,8 @@ public function renderBegin(): string
 			foreach (preg_split('#[;&]#', $query, -1, PREG_SPLIT_NO_EMPTY) as $param) {
 				$parts = explode('=', $param, 2);
 				$name = urldecode($parts[0]);
-				if (!isset($this->form[$name])) {
+				$prefix = explode('[', $name, 2)[0];
+				if (!isset($this->form[$prefix])) {
 					$s .= Html::el('input', ['type' => 'hidden', 'name' => $name, 'value' => urldecode($parts[1])]);
 				}
 			}

tests/Forms.Latte/Runtime.get.phpt

@@ -15,15 +15,16 @@ require __DIR__ . '/../bootstrap.php';
 
 $form = new Form;
 $form->setMethod('GET');
-$form->action = 'http://example.com/?do=foo-submit#toc';
+$form->addText('arg1');
+$form->addText('arg2');
+$form->setAction('http://example.com/?do=foo-submit&arg0=1&arg1=1&arg2[x]=1#toc');
 
 Assert::same(
 	'<form action="http://example.com/#toc" method="get">',
 	Runtime::renderFormBegin($form, [])
 );
 
 Assert::match(
-	'<input type="hidden" name="do" value="foo-submit"><!--[if IE]><input type=IEbug disabled style="display:none"><![endif]-->
-</form>',
+	'<input type="hidden" name="do" value="foo-submit"><input type="hidden" name="arg0" value="1"></form>',
 	Runtime::renderFormEnd($form)
 );

tests/Forms/Forms.renderer.4.phpt

@@ -13,7 +13,9 @@ require __DIR__ . '/../bootstrap.php';
 
 $form = new Nette\Forms\Form;
 $form->setMethod('GET');
-$form->setAction('link?a=b&c[]=d');
+$form->setAction('link?a=b&c[]=d&list[0]=1');
+$form->addCheckboxList('list')
+	->setItems(['First', 'Second']);
 $form->addHidden('userid');
 $form->addSubmit('submit', 'Send');
 
@@ -23,6 +25,12 @@ Assert::match('<form action="link" method="get">
 	<input type="hidden" name="a" value="b"><input type="hidden" name="c[]" value="d">
 
 <table>
+<tr>
+	<th><label></label></th>
+
+	<td><label><input type="checkbox" name="list[]" value="0">First</label><br><label><input type="checkbox" name="list[]" value="1">Second</label></td>
+</tr>
+
 <tr>
 	<th></th>
 
@@ -33,4 +41,4 @@ Assert::match('<form action="link" method="get">
 <input type="hidden" name="userid" value=""><!--[if IE]><input type=IEbug disabled style="display:none"><![endif]-->
 </form>', $form->__toString(true));
 
-Assert::same('link?a=b&c[]=d', $form->getAction());
+Assert::same('link?a=b&c[]=d&list[0]=1', $form->getAction());