{capture} creates Html object only in HTML-TEXT context

nette · Feb 24, 2021 · c3abdb6 · c3abdb6
1 parent 4041bd3
commit c3abdb6
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 1 deletion.
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
@@ -254,7 +254,7 @@ public function macroCapture(MacroNode $node, PhpWriter $writer)
 	 */
 	public function macroCaptureEnd(MacroNode $node, PhpWriter $writer)
 	{
-		$body = in_array($node->context[0], [Engine::CONTENT_HTML, Engine::CONTENT_XHTML], true)
+		$body = in_array(implode($node->context), [Engine::CONTENT_HTML, Engine::CONTENT_XHTML], true)
 			? 'ob_get_length() ? new LR\\Html(ob_get_clean()) : ob_get_clean()'
 			: 'ob_get_clean()';
 		return $writer->write("\$_fi = new LR\\FilterInfo(%var); %raw = %modifyContent($body);", implode($node->context), $node->data->variable);

diff --git a/tests/Latte/CoreMacros.capture.phpt b/tests/Latte/CoreMacros.capture.phpt
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Test: {capture}
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader);
+
+Assert::match(
+	'',
+	$latte->renderToString('{capture $var}<html>{/capture}')
+);
+
+Assert::match(
+	'string',
+	$latte->renderToString('{capture $var}{/capture}{=gettype($var)}')
+);
+
+Assert::match(
+	Latte\Runtime\Html::class,
+	$latte->renderToString('{capture $var}<html>{/capture}{=get_class($var)}')
+);
+
+Assert::match(
+	'TEST',
+	$latte->renderToString('{capture $var|stripHtml|upper}<b>Test</b>{/capture}{=$var}')
+);
+
+Assert::match(
+	'<!--  --> &lt;foo&gt;',
+	$latte->renderToString('<!-- {capture $x}<foo>{/capture} --> {$x}')
+);