FormMacros: creates $form before <form n:name> is rendered

nette · Jun 1, 2016 · 77ffdfb · 77ffdfb
1 parent bcb0685
commit 77ffdfb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/src/Bridges/FormsLatte/FormMacros.php b/src/Bridges/FormsLatte/FormMacros.php
@@ -165,11 +165,14 @@ public function macroNameAttr(MacroNode $node, PhpWriter $writer)
 		$node->empty = $tagName === 'input';
 
 		if ($tagName === 'form') {
+			$node->openingCode = $writer->write(
+				'<?php $form = $_form = $this->global->formsStack[] = '
+				. ($name[0] === '$' ? 'is_object(%0.word) ? %0.word : ' : '')
+				. '$this->global->uiControl[%0.word]; ?>',
+				$name
+			);
 			return $writer->write(
-				'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = '
-					. ($name[0] === '$' ? 'is_object(%0.word) ? %0.word : ' : '')
-					. '$this->global->uiControl[%0.word], %1.var, FALSE)',
-				$name,
+				'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), %0.var, FALSE)',
 				array_fill_keys(array_keys($node->htmlNode->attrs), NULL)
 			);
 		} else {

diff --git a/tests/Forms.Latte/expected/FormMacros.button.phtml b/tests/Forms.Latte/expected/FormMacros.button.phtml
@@ -6,8 +6,10 @@ class Template%a% extends Latte\Runtime\Template
 
 	function render()
 	{
-%A%<form<?php
-		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], array (
+%A%
+		$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
+		?><form<?php
+		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), array (
 		), FALSE) ?>>
 	<button<?php
 		$_input = end($this->global->formsStack)["send"];

diff --git a/tests/Forms.Latte/expected/FormMacros.forms.phtml b/tests/Forms.Latte/expected/FormMacros.forms.phtml
@@ -191,9 +191,10 @@ class Template%a% extends Latte\Runtime\Template
 
 
 <?php
+		$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
 		if (1) {
 			?><form id="myForm" class="ajax"<?php
-			echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], array (
+			echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), array (
 			'id' => NULL,
 			'class' => NULL,
 			), FALSE) ?>>
@@ -208,8 +209,10 @@ class Template%a% extends Latte\Runtime\Template
 ?>
 
 
-<FORM<?php
-		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = is_object($this->global->uiControl['myForm']) ? $this->global->uiControl['myForm'] : $this->global->uiControl[$this->global->uiControl['myForm']], array (
+<?php
+		$form = $_form = $this->global->formsStack[] = is_object($this->global->uiControl['myForm']) ? $this->global->uiControl['myForm'] : $this->global->uiControl[$this->global->uiControl['myForm']];
+		?><FORM<?php
+		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), array (
 		), FALSE) ?>>
 	<input<?php
 		$_input = end($this->global->formsStack)["username"];

diff --git a/tests/Forms.Latte/expected/FormMacros.get.phtml b/tests/Forms.Latte/expected/FormMacros.get.phtml
@@ -5,8 +5,10 @@
 ?>
 
 
-<form<?php
-		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], array (
+<?php
+		$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
+		?><form<?php
+		echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), array (
 		), FALSE) ?>>
 <?php
 		echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack), FALSE);