macro n:attr expands array (#158)

When the first and only argument to n:attr macro is an array, expand it.
nette · May 17, 2017 · b6163f1 · b6163f1
1 parent 4d95f3a
commit b6163f1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
@@ -395,7 +395,7 @@ public function macroClass(MacroNode $node, PhpWriter $writer)
 	 */
 	public function macroAttr(MacroNode $node, PhpWriter $writer)
 	{
-		return $writer->write('echo LR\Filters::htmlAttributes(%node.array);');
+		return $writer->write('$_tmp = %node.array; echo LR\Filters::htmlAttributes(isset($_tmp[0]) && is_array($_tmp[0]) ? $_tmp[0] : $_tmp);');
 	}
 
 

diff --git a/tests/Latte/expected/macros.n-macros.html b/tests/Latte/expected/macros.n-macros.html
@@ -1,7 +1,7 @@
 
 <p title="hello"> </p>
 
-
+<p title="hello"> </p>
 
 	<b>item</b>
 	<b class="even">item</b>

diff --git a/tests/Latte/expected/macros.n-macros.phtml b/tests/Latte/expected/macros.n-macros.phtml
@@ -17,10 +17,14 @@ class Template%a% extends Latte\Runtime\Template
 %A%
 
 <p<?php
-		echo LR\Filters::htmlAttributes(['title' => 'hello', 'lang' => isset($lang) ? $lang : NULL]);
+		$_tmp = ['title' => 'hello', 'lang' => isset($lang) ? $lang : NULL];
+		echo LR\Filters::htmlAttributes(isset($_tmp[0]) && is_array($_tmp[0]) ? $_tmp[0] : $_tmp);
 ?>> </p>
 
-
+<p<?php
+		$_tmp = [['title' => 'hello']];
+		echo LR\Filters::htmlAttributes(isset($_tmp[0]) && is_array($_tmp[0]) ? $_tmp[0] : $_tmp);
+?>> </p>
 
 <?php
 		$iterations = 0;

diff --git a/tests/Latte/templates/macros.n-macros.latte b/tests/Latte/templates/macros.n-macros.latte
@@ -1,7 +1,7 @@
 
 <p n:attr="title => hello, lang => isset($lang) ? $lang"> </p>
 
-
+<p n:attr="[title => hello]"> </p>
 
 {foreach [1,2,3] as $foo}
 	<b n:class="$iterator->even ? even">item</b>
-Original file line number
+Diff line change
@@ Expand Up @@
     	 */
     	public function macroAttr(MacroNode $node, PhpWriter $writer)
     	{
-    		return $writer->write('echo LR\Filters::htmlAttributes(%node.array);');
+    		return $writer->write('$_tmp = %node.array; echo LR\Filters::htmlAttributes(isset($_tmp[0]) && is_array($_tmp[0]) ? $_tmp[0] : $_tmp);');
     	}
@@ Expand Down @@