{block|filter} passes full content-type to FilterInfo (BC break)

nette · Feb 22, 2021 · db1f437 · db1f437
1 parent 6261d6a
commit db1f437
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
@@ -261,7 +261,7 @@ public function macroBlock(MacroNode $node, PhpWriter $writer): string
 			$node->modifiers .= '|escape';
 			$node->closingCode = $writer->write(
 				'<?php $ʟ_fi = new LR\FilterInfo(%var); echo %modifyContent(ob_get_clean()); ?>',
-				$node->context[0]
+				implode($node->context)
 			);
 			return $writer->write('ob_start(function () {}) %node.line;');
 		}

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::exception(function () use ($latte) {
+	$latte->renderToString('context6a');
+}, Latte\RuntimeException::class, 'Filter |stripHtml used with incompatible type HTMLCOMMENT.');
diff --git a/tests/Latte/contentType.html.javascript.phpt b/tests/Latte/contentType.html.javascript.phpt
@@ -115,3 +115,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>')
+);