FormMacros: <label n:name></label> is rendered without caption, fixes 6d16631

Author: dg

composer.json

@@ -22,7 +22,7 @@
 	"require-dev": {
 		"nette/di": "~2.3",
 		"nette/tester": "~1.3",
-		"latte/latte": "~2.3",
+		"latte/latte": "~2.3, >=2.3.2",
 		"tracy/tracy": "~2.2"
 	},
 	"conflict": {

src/Bridges/FormsLatte/FormMacros.php

@@ -197,11 +197,11 @@ public function macroNameEnd(MacroNode $node, PhpWriter $writer)
 		if ($tagName === 'form') {
 			$node->content = $parts[1] . $parts[2] . '<?php echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd($_form, FALSE) ?>' . $parts[3];
 		} elseif ($tagName === 'label') {
-			if ($parts[2] === '') {
+			if ($node->htmlNode->isEmpty) {
 				$node->content = $parts[1] . '<?php echo $_input->getLabel()->getHtml() ?>' . $parts[3];
 			}
 		} elseif ($tagName === 'button') {
-			if ($parts[2] === '') {
+			if ($node->htmlNode->isEmpty) {
 				$node->content = $parts[1] . '<?php echo htmlspecialchars($_input->caption) ?>' . $parts[3];
 			}
 		} else { // select, textarea

tests/Forms.Latte/expected/FormMacros.button.html

@@ -3,6 +3,8 @@
 		description of button
 	</button>
 
+	<button type="submit" name="send" value="Sign in"></button>
+
 	<button type="submit" name="send" value="Sign in">Sign in</button>
 %A%
 </form>

tests/Forms.Latte/expected/FormMacros.button.phtml

@@ -6,6 +6,8 @@
 		description of button
 	</button>
 
+	<button<?php $_input = $_form["send"]; echo $_input->{method_exists($_input, 'getControlPart')?'getControlPart':'getControl'}()->attributes() ?>></button>
+
 	<button<?php $_input = $_form["send"]; echo $_input->{method_exists($_input, 'getControlPart')?'getControlPart':'getControl'}()->attributes() ?>
 ><?php echo htmlspecialchars($_input->caption) ?></button>
 <?php echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd($_form, FALSE) ?></form>

tests/Forms.Latte/expected/FormMacros.forms.html

@@ -50,6 +50,7 @@
 	<LABEL title=hello for="frm-username">Name</LABEL>
 	<input value=val type class="hello" name="username" id="frm-username">
 
+	<label for="frm-username"></label>
 	<label for="frm-username">Username:</label>
 	<input type="text" name="username" id="frm-username">
 

tests/Forms.Latte/expected/FormMacros.forms.phtml

@@ -34,6 +34,7 @@ echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $_contro
   'class' => NULL,
 ))->attributes() ?>>
 
+	<label<?php $_input = is_object($form['username']) ? $form['username'] : $_form[$form['username']]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->attributes() ?>></label>
 	<label<?php $_input = is_object($form['username']) ? $form['username'] : $_form[$form['username']]; echo $_input->{method_exists($_input, 'getLabelPart')?'getLabelPart':'getLabel'}()->attributes() ?>
 ><?php echo $_input->getLabel()->getHtml() ?></label>
 	<input<?php $_input = is_object($form['username']) ? $form['username'] : $_form[$form['username']]; echo $_input->{method_exists($_input, 'getControlPart')?'getControlPart':'getControl'}()->attributes() ?>>

tests/Forms.Latte/templates/forms.button.latte

@@ -4,4 +4,6 @@
 	</button>
 
 	<button n:name="send"></button>
+
+	<button n:name="send" />
 </form>

tests/Forms.Latte/templates/forms.latte

@@ -17,6 +17,7 @@
 	<input value=val type class="hello" n:name="username">
 
 	<label n:name="$form['username']"></label>
+	<label n:name="$form['username']" />
 	<input n:name="$form[username]">
 
 	{label my/}{input my}