{block|filter} passes full content-type to FilterInfo

nette · Feb 18, 2021 · 20d77a0 · 20d77a0
1 parent 77a0d5f
commit 20d77a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
@@ -400,7 +400,7 @@ public function macroBlockEnd(MacroNode $node, PhpWriter $writer)
 
 		} elseif ($node->modifiers) { // anonymous block with modifier
 			$node->modifiers .= '|escape';
-			return $writer->write('$_fi = new LR\FilterInfo(%var); echo %modifyContent(ob_get_clean());', $node->context[0]);
+			return $writer->write('$_fi = new LR\FilterInfo(%var); echo %modifyContent(ob_get_clean());', implode($node->context));
 		}
 	}
 

diff --git a/tests/Latte/contentType.compatibility.phpt b/tests/Latte/contentType.compatibility.phpt
@@ -379,4 +379,7 @@ Assert::same('<p> " &lt;</p>', $latte->renderToString('context1c'));
 Assert::same('<p title="<hr> &quot;"</p>', $latte->renderToString('context2'));
 Assert::same('<p title=" &quot;"></p>', $latte->renderToString('context2a'));
 Assert::same('<!--<hr> &lt;-->', $latte->renderToString('context6'));
-Assert::same('<!-- <-->', $latte->renderToString('context6a'));
+
+Assert::error(function () use ($latte) {
+	$latte->renderToString('context6a');
+}, E_USER_WARNING, 'Filter |stripHtml used with incompatible type HTMLCOMMENT');
diff --git a/tests/Latte/contentType.html.javascript.phpt b/tests/Latte/contentType.html.javascript.phpt
@@ -110,3 +110,9 @@ Assert::match(
 	<div n:foreach="[a, b] as $i">{$i}</div>
 ')
 );
+
+// trim inside <script>
+Assert::match(
+	'<script>123;</script>',
+	$latte->renderToString('<script>{block|trim}  123;  {/block}</script>')
+);