Empty closing macro {/} is deprecated

nette · Jan 22, 2022 · 324a831 · 324a831
1 parent 647d97a
commit 324a831
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
@@ -671,6 +671,10 @@ public function closeMacro(
 			throw new CompileException("Unexpected $name" . ($node ? ', expecting ' . self::printEndTag($node->prefix ? $this->htmlNode : $node) : ''));
 		}
 
+		if ($name === '') {
+			trigger_error("Empty closing tag {/} is deprecated, use {/$node->name} on line " . $this->getLine(), E_USER_DEPRECATED);
+		}
+
 		$this->macroNode = $node->parentNode;
 		if ($node->args === '') {
 			$node->setArgs($args);

diff --git a/tests/Latte/BlockMacros.include.block.phpt b/tests/Latte/BlockMacros.include.block.phpt
@@ -14,16 +14,16 @@ require __DIR__ . '/../bootstrap.php';
 
 $latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader([
-	'main1' => '{define block}[block {$var}]{/} before {include block, var => 1} after',
-	'main2' => '{define block}[block {$var}]{/} before {include #block, var => 1} after',
-	'main3' => '{define block-2}[block {$var}]{/} before {include block-2, var => 1} after',
-	'main4' => '{define block.2}[block {$var}]{/} before {include block.2, var => 1} after',
-	'main5' => '{define block.2}[block {$var}]{/} before {include #block.2, var => 1} after',
-	'main6' => '{define block.2}[block {$var}]{/} before {include block block.2, var => 1} after',
+	'main1' => '{define block}[block {$var}]{/define} before {include block, var => 1} after',
+	'main2' => '{define block}[block {$var}]{/define} before {include #block, var => 1} after',
+	'main3' => '{define block-2}[block {$var}]{/define} before {include block-2, var => 1} after',
+	'main4' => '{define block.2}[block {$var}]{/define} before {include block.2, var => 1} after',
+	'main5' => '{define block.2}[block {$var}]{/define} before {include #block.2, var => 1} after',
+	'main6' => '{define block.2}[block {$var}]{/define} before {include block block.2, var => 1} after',
 	'main7' => '{define block}[block {$var}]{/define} {var $name = block} before {include block $name, var => 1} after',
 
-	'main8' => '{define block}<b>block {$var}</b>{/} before {include block, var => 1|striptags} after',
-	'main9' => '{define block}block {$var}{/} before {include block true ? "block", var => 2} after',
+	'main8' => '{define block}<b>block {$var}</b>{/define} before {include block, var => 1|striptags} after',
+	'main9' => '{define block}block {$var}{/define} before {include block true ? "block", var => 2} after',
 ]));
 
 Assert::match(

diff --git a/tests/Latte/Compiler.macro.lines.phpt b/tests/Latte/Compiler.macro.lines.phpt
@@ -80,7 +80,7 @@ Assert::match(
 	$latte->compile('
 		{one}
 
-		{/
+		{/one
 		}')
 );
 

diff --git a/tests/Latte/templates/filters.general.latte b/tests/Latte/templates/filters.general.latte
@@ -8,7 +8,7 @@
 	<li>translated: {_$hello|truncate:3}</li>
 	<li>Translated HTML: {_}{$hello}{/_}</li>
 	<li>Translated HTML: {_}ahoj{/_}</li>
-	<li>Translated HTML: {_}ahoj{/}</li>
+	<li>Translated HTML: {_}ahoj{/_}</li>
 	<li>Translated HTML: {_'ahoj|ahojahojahojahoj'}</li>
 	<li>spaces: {$hello |types , '' , ""	,	"$hello"  }</li>
 	<li>dynamic: {$hello |dynamic} {$hello |dynamic2}</li>

diff --git a/tests/Latte/templates/general.latte b/tests/Latte/templates/general.latte
@@ -40,7 +40,7 @@
 	{$any}
 {else}
 	none
-{/}
+{/if}
 
 
 {foreach array(true) as $foo}