From 33bcc0b08b56477cd81f0b6049f3c5184af857d7 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 16 Jul 2019 16:47:16 +0200
Subject: [PATCH 01/20] opened 3.0-dev

---
 composer.json        | 2 +-
 src/Latte/Engine.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 3d09a1fcf..999ccdd02 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.10-dev"
+			"dev-master": "3.0-dev"
 		}
 	}
 }
diff --git a/src/Latte/Engine.php b/src/Latte/Engine.php
index 0eab37236..e79f135d6 100644
--- a/src/Latte/Engine.php
+++ b/src/Latte/Engine.php
@@ -17,8 +17,8 @@ class Engine
 {
 	use Strict;
 
-	public const VERSION = '2.10.3';
-	public const VERSION_ID = 21003;
+	public const VERSION = '3.0.0-dev';
+	public const VERSION_ID = 30000;
 
 	/** Content types */
 	public const
@@ -290,7 +290,7 @@ public function addFilter(?string $name, callable $callback)
 
 
 	/**
-	 * Registers filter loader.
+	 * Registers run-time filter loader.
 	 * @return static
 	 */
 	public function addFilterLoader(callable $callback)

From 80980c7aadaf32348cb13d39e19c020c72e8deb8 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 18 Feb 2021 16:02:10 +0100
Subject: [PATCH 02/20] anonymous {block} create variable scope (possible BC
 break)

---
 src/Latte/Macros/BlockMacros.php            | 20 +++++++++--------
 tests/Latte/expected/BlockMacros.vars.html  |  7 +++---
 tests/Latte/expected/BlockMacros.vars.phtml | 25 ++++++++++++---------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
index 06c726315..f0fcc46fe 100644
--- a/src/Latte/Macros/BlockMacros.php
+++ b/src/Latte/Macros/BlockMacros.php
@@ -249,7 +249,7 @@ public function macroExtends(MacroNode $node, PhpWriter $writer): void
 	/**
 	 * {block [local] [name]}
 	 */
-	public function macroBlock(MacroNode $node, PhpWriter $writer): string
+	public function macroBlock(MacroNode $node, PhpWriter $writer)
 	{
 		[$name, $local] = $node->tokenizer->fetchWordWithModifier('local');
 		$layer = $local ? Template::LAYER_LOCAL : null;
@@ -258,15 +258,17 @@ public function macroBlock(MacroNode $node, PhpWriter $writer): string
 		$this->checkExtraArgs($node);
 
 		if ($data->name === '') {
-			if ($node->modifiers === '') {
-				return '';
+			$node->openingCode = '<?php (function () { extract(func_get_arg(0)); ?>';
+			$node->closingCode = '<?php })(get_defined_vars()); ?>';
+			if ($node->modifiers !== '') {
+				$node->modifiers .= '|escape';
+				$node->openingCode = $writer->write('<?php ob_start(function () {}) %node.line; ?>') . $node->openingCode;
+				$node->closingCode .= $writer->write(
+					'<?php $ʟ_fi = new LR\FilterInfo(%var); echo %modifyContent(ob_get_clean()); ?>',
+					implode($node->context)
+				);
 			}
-			$node->modifiers .= '|escape';
-			$node->closingCode = $writer->write(
-				'<?php $ʟ_fi = new LR\FilterInfo(%var); echo %modifyContent(ob_get_clean()); ?>',
-				implode($node->context)
-			);
-			return $writer->write('ob_start(function () {}) %node.line;');
+			return;
 		}
 
 		if (Helpers::startsWith((string) $node->context[1], Latte\Compiler::CONTEXT_HTML_ATTRIBUTE)) {
diff --git a/tests/Latte/expected/BlockMacros.vars.html b/tests/Latte/expected/BlockMacros.vars.html
index 89c493497..0fa087c6a 100644
--- a/tests/Latte/expected/BlockMacros.vars.html
+++ b/tests/Latte/expected/BlockMacros.vars.html
@@ -11,10 +11,9 @@
 
 a
 
-blockmod
-
+a
 
-	blockmod
 
+	a
 
-block
+a
diff --git a/tests/Latte/expected/BlockMacros.vars.phtml b/tests/Latte/expected/BlockMacros.vars.phtml
index 10d48b456..8a0c967f6 100644
--- a/tests/Latte/expected/BlockMacros.vars.phtml
+++ b/tests/Latte/expected/BlockMacros.vars.phtml
@@ -21,10 +21,13 @@
 
 ';
 		ob_start(function () {}) /* line %d% */;
-		echo '	';
-		echo LR\Filters::escapeHtmlText($var) /* line %d% */;
-		echo "\n";
-		$var = 'blockmod' /* line %d% */;
+		(function () {
+			extract(func_get_arg(0));
+			echo '	';
+			echo LR\Filters::escapeHtmlText($var) /* line %d% */;
+			echo "\n";
+			$var = 'blockmod' /* line %d% */;
+		})(get_defined_vars());
 		$ʟ_fi = new LR\FilterInfo('html');
 		echo LR\Filters::convertTo($ʟ_fi, 'html', $this->filters->filterContent('trim', $ʟ_fi, ob_get_clean()));
 		echo '
@@ -34,13 +37,15 @@
 		echo '
 
 
-	';
-		echo LR\Filters::escapeHtmlText($var) /* line %d% */;
-		echo "\n";
-		$var = 'block' /* line %d% */;
-		echo '
-
 ';
+		(function () {
+			extract(func_get_arg(0));
+			echo '	';
+			echo LR\Filters::escapeHtmlText($var) /* line %d% */;
+			echo "\n";
+			$var = 'block' /* line %d% */;
+		})(get_defined_vars());
+		echo "\n";
 		echo LR\Filters::escapeHtmlText($var) /* line %d% */;
 		return get_defined_vars();
 	}

From 90950cdfaafb86fca6052d4d808cdbdedae2a402 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sun, 12 Jan 2020 04:44:15 +0100
Subject: [PATCH 03/20] added macro n:nonce

---
 src/Latte/Macros/CoreMacros.php   |  2 ++
 tests/Latte/CoreMacros.nonce.phpt | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 tests/Latte/CoreMacros.nonce.phpt

diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
index b0e588319..a356f23dc 100644
--- a/src/Latte/Macros/CoreMacros.php
+++ b/src/Latte/Macros/CoreMacros.php
@@ -90,6 +90,8 @@ public static function install(Latte\Compiler $compiler): void
 		$me->addMacro('varPrint', [$me, 'macroVarPrint'], null, null, self::ALLOWED_IN_HEAD);
 		$me->addMacro('templateType', [$me, 'macroTemplateType'], null, null, self::ALLOWED_IN_HEAD);
 		$me->addMacro('templatePrint', [$me, 'macroTemplatePrint'], null, null, self::ALLOWED_IN_HEAD);
+
+		$me->addMacro('nonce', null, null, 'echo $this->global->coreNonce ? " nonce=\"" . htmlspecialchars($this->global->coreNonce) . "\"" : "";');
 	}
 
 
diff --git a/tests/Latte/CoreMacros.nonce.phpt b/tests/Latte/CoreMacros.nonce.phpt
new file mode 100644
index 000000000..57f85a55f
--- /dev/null
+++ b/tests/Latte/CoreMacros.nonce.phpt
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Test: n:nonce
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addProvider('coreNonce', null);
+
+Assert::match(
+	'<script></script>',
+	$latte->renderToString('<script n:nonce></script>')
+);
+
+
+$latte->addProvider('coreNonce', 'djsdgidk');
+
+Assert::match(
+	'<script nonce="djsdgidk"></script>',
+	$latte->renderToString('<script n:nonce></script>')
+);

From b0a436b82c1e99956b91db0777a0c24850162efc Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 4 Nov 2020 23:07:05 +0100
Subject: [PATCH 04/20] added {cycle}

---
 src/Latte/Macros/CoreMacros.php             |  1 +
 tests/Latte/CoreMacros.cycle.phpt           | 49 +++++++++++++++++++++
 tests/Latte/expected/CoreMacros.cycle.phtml | 35 +++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 tests/Latte/CoreMacros.cycle.phpt
 create mode 100644 tests/Latte/expected/CoreMacros.cycle.phtml

diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
index a356f23dc..fcb7012a5 100644
--- a/src/Latte/Macros/CoreMacros.php
+++ b/src/Latte/Macros/CoreMacros.php
@@ -58,6 +58,7 @@ public static function install(Latte\Compiler $compiler): void
 		$me->addMacro('first', 'if ($iterator->isFirst(%node.args)) %node.line {', '}');
 		$me->addMacro('last', 'if ($iterator->isLast(%node.args)) %node.line {', '}');
 		$me->addMacro('sep', 'if (!$iterator->isLast(%node.args)) %node.line {', '}');
+		$me->addMacro('cycle', '$_tmp = %node.array; echo %escape($_tmp[$iterator->getCounter0() % count($_tmp)]) %node.line;');
 
 		$me->addMacro('try', [$me, 'macroTry'], '}');
 		$me->addMacro('rollback', [$me, 'macroRollback']);
diff --git a/tests/Latte/CoreMacros.cycle.phpt b/tests/Latte/CoreMacros.cycle.phpt
new file mode 100644
index 000000000..ad2fa21a3
--- /dev/null
+++ b/tests/Latte/CoreMacros.cycle.phpt
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Test: {cycle}
+ */
+
+declare(strict_types=1);
+
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+$latte->setLoader(new Latte\Loaders\StringLoader);
+
+$template = <<<'EOD'
+
+{foreach range(1, 5) as $i}  {cycle a, b, c}  {/foreach}
+
+
+{foreach range(1, 5) as $i}
+	{continueIf $i % 2}
+	{cycle a, b, c}
+{/foreach}
+
+
+{foreach range(1, 5) as $i}  {cycle $i, b, c}  {/foreach}
+
+EOD;
+
+/*Assert::matchFile(
+	__DIR__ . '/expected/CoreMacros.cycle.phtml',
+	$latte->compile($template)
+);*/
+
+Assert::match(
+	'
+  a    b    c    a    b
+
+
+	b
+	a
+
+
+  1    b    c    4    b',
+	$latte->renderToString($template)
+);
diff --git a/tests/Latte/expected/CoreMacros.cycle.phtml b/tests/Latte/expected/CoreMacros.cycle.phtml
new file mode 100644
index 000000000..549587891
--- /dev/null
+++ b/tests/Latte/expected/CoreMacros.cycle.phtml
@@ -0,0 +1,35 @@
+<?php
+%A%
+		foreach ([1, 1, 2, 3, 3, 3] as $i) {
+			?> <?php
+			if (($this->global->ifchanged[1] ?? null) !== ($_tmp = [$i])) {
+				$this->global->ifchanged[1] = $_tmp;
+				?> <?php echo LR\Filters::escapeHtmlText($i) /* line %d% */ ?> <?php
+			}
+			?> <?php
+			$iterations++;
+		}
+?>
+
+
+--
+
+<?php
+		$iterations = 0;
+		foreach ([1, 1, 2, 3, 3, 3] as $i) {
+			?>	<?php
+			if (($this->global->ifchanged[2] ?? null) !== ($_tmp = [$i])) {
+				$this->global->ifchanged[2] = $_tmp;
+				?> <?php echo LR\Filters::escapeHtmlText($i) /* line %d% */ ?> <?php
+			}
+			else {
+				?> same <?php
+			}
+?>
+
+	<?php
+			if (($this->global->ifchanged[3] ?? null) !== ($_tmp = ['a', 'b'])) {
+				$this->global->ifchanged[3] = $_tmp;
+				?> const <?php
+			}
+%A%

From 67e124f5fdd663be67bc5fbb0f5304b2f1a16d29 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 20 Feb 2019 11:12:13 +0100
Subject: [PATCH 05/20] SnippetBridge: added typehints

---
 composer.json                           |  2 +-
 src/Latte/Runtime/SnippetBridge.php     | 53 ++++++-------------------
 tests/Latte/mocks/SnippetBridgeMock.php | 10 ++---
 3 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/composer.json b/composer.json
index 999ccdd02..c1b10fe56 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
 		"nette/php-generator": "to use tag {templatePrint}"
 	},
 	"conflict": {
-		"nette/application": "<2.4.1"
+		"nette/application": "<3.0"
 	},
 	"autoload": {
 		"classmap": ["src/"]
diff --git a/src/Latte/Runtime/SnippetBridge.php b/src/Latte/Runtime/SnippetBridge.php
index e8e7b8c2c..eeace1822 100644
--- a/src/Latte/Runtime/SnippetBridge.php
+++ b/src/Latte/Runtime/SnippetBridge.php
@@ -16,46 +16,19 @@
  */
 interface SnippetBridge
 {
-	/**
-	 * @return bool
-	 */
-	function isSnippetMode();
-
-	/**
-	 * @param  bool  $snippetMode
-	 * @return void
-	 */
-	function setSnippetMode($snippetMode);
-
-	/**
-	 * @param  string  $name
-	 * @return bool
-	 */
-	function needsRedraw($name);
-
-	/**
-	 * @param  string  $name
-	 * @return void
-	 */
-	function markRedrawn($name);
-
-	/**
-	 * @param  string  $name
-	 * @return string
-	 */
-	function getHtmlId($name);
-
-	/**
-	 * @param  string  $name
-	 * @param  string  $content
-	 * @return void
-	 */
-	function addSnippet($name, $content);
-
-	/**
-	 * @return void
-	 */
-	function renderChildren();
+	function isSnippetMode(): bool;
+
+	function setSnippetMode(bool $snippetMode);
+
+	function needsRedraw(string $name): bool;
+
+	function markRedrawn(string $name): void;
+
+	function getHtmlId(string $name): string;
+
+	function addSnippet(string $name, string $content): void;
+
+	function renderChildren(): void;
 }
 
 
diff --git a/tests/Latte/mocks/SnippetBridgeMock.php b/tests/Latte/mocks/SnippetBridgeMock.php
index 3f2f431a9..232a5b2d1 100644
--- a/tests/Latte/mocks/SnippetBridgeMock.php
+++ b/tests/Latte/mocks/SnippetBridgeMock.php
@@ -18,19 +18,19 @@ public function isSnippetMode(): bool
 	}
 
 
-	public function setSnippetMode($snippetMode)
+	public function setSnippetMode(bool $snippetMode)
 	{
 		$this->snippetMode = $snippetMode;
 	}
 
 
-	public function needsRedraw($name): bool
+	public function needsRedraw(string $name): bool
 	{
 		return $this->invalid === true || isset($this->invalid[$name]);
 	}
 
 
-	public function markRedrawn($name): void
+	public function markRedrawn(string $name): void
 	{
 		if ($this->invalid !== true) {
 			unset($this->invalid[$name]);
@@ -38,13 +38,13 @@ public function markRedrawn($name): void
 	}
 
 
-	public function getHtmlId($name): string
+	public function getHtmlId(string $name): string
 	{
 		return $name;
 	}
 
 
-	public function addSnippet($name, $content): void
+	public function addSnippet(string $name, string $content): void
 	{
 		$this->payload[$name] = $content;
 	}

From 163fa75ee6697ac156f788438ecc302c6a1547d9 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 18 Feb 2021 16:02:45 +0100
Subject: [PATCH 06/20] Template: removed old accumulators $_l, $_g (deprecated
 in 2.4, BC break)

---
 src/Latte/Runtime/Blueprint.php | 2 +-
 src/Latte/Runtime/Template.php  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Latte/Runtime/Blueprint.php b/src/Latte/Runtime/Blueprint.php
index eb81e2352..f98bb1193 100644
--- a/src/Latte/Runtime/Blueprint.php
+++ b/src/Latte/Runtime/Blueprint.php
@@ -58,7 +58,7 @@ public function printVars(array $vars): void
 
 		$res = '';
 		foreach ($vars as $name => $value) {
-			if (Latte\Helpers::startsWith($name, 'ʟ_') || $name === '_l' || $name === '_g') {
+			if (Latte\Helpers::startsWith($name, 'ʟ_')) {
 				continue;
 			}
 			$type = Php\Type::getType($value) ?: 'mixed';
diff --git a/src/Latte/Runtime/Template.php b/src/Latte/Runtime/Template.php
index b8a3c1c9f..326aa75f8 100644
--- a/src/Latte/Runtime/Template.php
+++ b/src/Latte/Runtime/Template.php
@@ -191,8 +191,6 @@ private function doRender(string $block = null): bool
 			$this->global->snippetDriver = new SnippetDriver($this->global->snippetBridge);
 		}
 		Filters::$xhtml = (bool) preg_match('#xml|xhtml#', static::CONTENT_TYPE);
-		$this->params['_l'] = new \stdClass; // old accumulators for back compatibility
-		$this->params['_g'] = $this->global;
 
 		if ($this->referenceType === 'import') {
 			if ($this->parentName) {

From 0c208d5b51d02c703296444515cd12ae14023856 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 23 Nov 2020 00:19:39 +0100
Subject: [PATCH 07/20] removed aliases for old classes ILoader, IMacro,
 IHtmlString, IISnippetBridge

---
 src/Latte/Loader.php                 |  3 --
 src/Latte/Macro.php                  |  3 --
 src/Latte/Runtime/HtmlStringable.php |  3 --
 src/Latte/Runtime/SnippetBridge.php  |  3 --
 src/compatibility.php                | 48 ----------------------------
 5 files changed, 60 deletions(-)
 delete mode 100644 src/compatibility.php

diff --git a/src/Latte/Loader.php b/src/Latte/Loader.php
index 7b103877f..12ecdb363 100644
--- a/src/Latte/Loader.php
+++ b/src/Latte/Loader.php
@@ -45,6 +45,3 @@ function getReferredName($name, $referringName);
 	 */
 	function getUniqueId($name);
 }
-
-
-interface_exists(ILoader::class);
diff --git a/src/Latte/Macro.php b/src/Latte/Macro.php
index 844d74863..2513356e0 100644
--- a/src/Latte/Macro.php
+++ b/src/Latte/Macro.php
@@ -45,6 +45,3 @@ function nodeOpened(MacroNode $node);
 	 */
 	function nodeClosed(MacroNode $node);
 }
-
-
-interface_exists(IMacro::class);
diff --git a/src/Latte/Runtime/HtmlStringable.php b/src/Latte/Runtime/HtmlStringable.php
index 7eed26af6..fc21794a2 100644
--- a/src/Latte/Runtime/HtmlStringable.php
+++ b/src/Latte/Runtime/HtmlStringable.php
@@ -15,6 +15,3 @@ interface HtmlStringable
 	/** @return string in HTML format */
 	function __toString(): string;
 }
-
-
-interface_exists(IHtmlString::class);
diff --git a/src/Latte/Runtime/SnippetBridge.php b/src/Latte/Runtime/SnippetBridge.php
index eeace1822..8d3428d06 100644
--- a/src/Latte/Runtime/SnippetBridge.php
+++ b/src/Latte/Runtime/SnippetBridge.php
@@ -30,6 +30,3 @@ function addSnippet(string $name, string $content): void;
 
 	function renderChildren(): void;
 }
-
-
-interface_exists(ISnippetBridge::class);
diff --git a/src/compatibility.php b/src/compatibility.php
deleted file mode 100644
index cabfad5c3..000000000
--- a/src/compatibility.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * This file is part of the Nette Framework (https://nette.org)
- * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Latte {
-	if (false) {
-		/** @deprecated use Latte\Loader */
-		interface ILoader extends Loader
-		{
-		}
-	} elseif (!interface_exists(ILoader::class)) {
-		class_alias(Loader::class, ILoader::class);
-	}
-
-	if (false) {
-		/** @deprecated use Latte\Macro */
-		interface IMacro extends Macro
-		{
-		}
-	} elseif (!interface_exists(IMacro::class)) {
-		class_alias(Macro::class, IMacro::class);
-	}
-}
-
-namespace Latte\Runtime {
-	if (false) {
-		/** @deprecated use Latte\Runtime\HtmlStringable */
-		interface IHtmlString extends HtmlStringable
-		{
-		}
-	} elseif (!interface_exists(IHtmlString::class)) {
-		class_alias(HtmlStringable::class, IHtmlString::class);
-	}
-
-	if (false) {
-		/** @deprecated use Latte\Runtime\SnippetBridge */
-		interface ISnippetBridge extends SnippetBridge
-		{
-		}
-	} elseif (!interface_exists(ISnippetBridge::class)) {
-		class_alias(SnippetBridge::class, ISnippetBridge::class);
-	}
-}

From 028d2b826ee54f146539485b8a8cd43b9a9dec07 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sat, 21 Nov 2020 04:06:16 +0100
Subject: [PATCH 08/20] Filters::escapeJS: invalid UTF-8 is replaced with
 Unicode Replacement Character U+FFFD (instead of throwing exception)

---
 src/Latte/Runtime/Filters.php       |  2 +-
 tests/Latte/Filters.escapeJs().phpt | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/Latte/Runtime/Filters.php b/src/Latte/Runtime/Filters.php
index 3df4b8552..e39f6a345 100644
--- a/src/Latte/Runtime/Filters.php
+++ b/src/Latte/Runtime/Filters.php
@@ -167,7 +167,7 @@ public static function escapeJs($s): string
 			$s = $s->__toString(true);
 		}
 
-		$json = json_encode($s, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+		$json = json_encode($s, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | (PHP_VERSION_ID >= 70200 ? JSON_INVALID_UTF8_SUBSTITUTE : 0));
 		if ($error = json_last_error()) {
 			throw new Latte\RuntimeException(json_last_error_msg(), $error);
 		}
diff --git a/tests/Latte/Filters.escapeJs().phpt b/tests/Latte/Filters.escapeJs().phpt
index 68ac81d8f..9432a6d9e 100644
--- a/tests/Latte/Filters.escapeJs().phpt
+++ b/tests/Latte/Filters.escapeJs().phpt
@@ -31,10 +31,15 @@ Assert::same('"<br>"', Filters::escapeJs(new Test));
 Assert::same('"<br>"', Filters::escapeJs(new Latte\Runtime\Html('<br>')));
 
 // invalid UTF-8
-Assert::exception(function () {
-	Filters::escapeJs("foo \u{D800} bar"); // invalid codepoint high surrogates
-}, Latte\RuntimeException::class, 'Malformed UTF-8 characters, possibly incorrectly encoded');
-
-Assert::exception(function () {
-	Filters::escapeJs("foo \xE3\x80\x22 bar"); // stripped UTF
-}, Latte\RuntimeException::class, 'Malformed UTF-8 characters, possibly incorrectly encoded');
+if (PHP_VERSION_ID >= 70200) {
+	Assert::same("\"foo \u{FFFD} bar\"", Filters::escapeJs("foo \u{D800} bar")); // invalid codepoint high surrogates
+	Assert::same("\"foo \u{FFFD}\\\" bar\"", Filters::escapeJs("foo \xE3\x80\x22 bar")); // stripped UTF
+} else {
+	Assert::exception(function () {
+		Filters::escapeJs("foo \u{D800} bar"); // invalid codepoint high surrogates
+	}, Latte\RuntimeException::class, 'Malformed UTF-8 characters, possibly incorrectly encoded');
+
+	Assert::exception(function () {
+		Filters::escapeJs("foo \xE3\x80\x22 bar"); // stripped UTF
+	}, Latte\RuntimeException::class, 'Malformed UTF-8 characters, possibly incorrectly encoded');
+}

From 24d33f3bc4835b9aff16c2469b1d1cdb2979b1da Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 19 Mar 2020 01:10:00 +0100
Subject: [PATCH 09/20] MacroTokens: correctly parses UTF-8 Combining character
 (TODO: normalization)

---
 src/Latte/Compiler/MacroTokens.php |  6 ++---
 tests/Latte/MacroTokens.parse.phpt | 41 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 tests/Latte/MacroTokens.parse.phpt

diff --git a/src/Latte/Compiler/MacroTokens.php b/src/Latte/Compiler/MacroTokens.php
index 42b5c93df..2ad25f906 100644
--- a/src/Latte/Compiler/MacroTokens.php
+++ b/src/Latte/Compiler/MacroTokens.php
@@ -54,10 +54,10 @@ public function parse(string $s): array
 			self::T_STRING => Parser::RE_STRING,
 			self::T_KEYWORD => '(?:true|false|null|TRUE|FALSE|NULL|INF|NAN|and|or|xor|AND|OR|XOR|clone|new|instanceof|return|continue|break)(?!\w)', // keyword
 			self::T_CAST => '\((?:expand|string|array|int|integer|float|bool|boolean|object)\)', // type casting
-			self::T_VARIABLE => '\$\w+',
+			self::T_VARIABLE => '\$(?>\w\pM*)+',
 			self::T_NUMBER => '[+-]?[0-9]+(?:\.[0-9]+)?(?:e[0-9]+)?',
-			self::T_SYMBOL => '\w+(?:-+\w+)*',
-			self::T_CHAR => '::|=>|->|\?->|\?\?->|\+\+|--|<<|>>|<=>|<=|>=|===|!==|==|!=|<>|&&|\|\||\?\?|\?>|\*\*|\.\.\.|[^"\']', // =>, any char except quotes
+			self::T_SYMBOL => '(?>\w\pM*)+(?:-+(?>\w\pM*)+)*',
+			self::T_CHAR => '::|=>|->|\?->|\?\?->|\+\+|--|<<|>>|<=>|<=|>=|===|!==|==|!=|<>|&&|\|\||\?\?|\?>|\*\*|\.\.\.|(?>[^"\']\pM*)', // =>, any char except quotes
 		], 'u');
 		return self::$tokenizer->tokenize($s);
 	}
diff --git a/tests/Latte/MacroTokens.parse.phpt b/tests/Latte/MacroTokens.parse.phpt
new file mode 100644
index 000000000..3d2fcb208
--- /dev/null
+++ b/tests/Latte/MacroTokens.parse.phpt
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Test: Latte\MacroTokens::parse()
+ */
+
+declare(strict_types=1);
+
+use Latte\MacroTokens;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('', function () {
+	$tokenizer = new MacroTokens('hello world');
+	Assert::same([
+		['hello', 0, MacroTokens::T_SYMBOL],
+		[' ', 5, MacroTokens::T_WHITESPACE],
+		['world', 6, MacroTokens::T_SYMBOL],
+	], $tokenizer->tokens);
+});
+
+
+test('', function () {  // UTF-8 Combining character
+	$tokenizer = new MacroTokens("\u{0061}\u{0300} $\u{0061}\u{0300}");
+	Assert::same([
+		["\u{0061}\u{0300}", 0, MacroTokens::T_SYMBOL],
+		[' ', 3, MacroTokens::T_WHITESPACE],
+		["$\u{0061}\u{0300}", 4, MacroTokens::T_VARIABLE],
+	], $tokenizer->tokens);
+});
+
+
+test('', function () {  // UTF-8 emoji
+	$tokenizer = new MacroTokens("\u{1F6E1}\u{FE0F}");
+	Assert::same([
+		["\u{1F6E1}\u{FE0F}", 0, MacroTokens::T_CHAR],
+	], $tokenizer->tokens);
+});

From 6a4e283a3421410f456ee0e948022ac8b594ad04 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 3 Dec 2020 15:02:54 +0100
Subject: [PATCH 10/20] optional chaining: removed support for deprecated
 syntax

---
 src/Latte/Compiler/PhpWriter.php              | 29 +------
 tests/Latte/PhpWriter.formatArgs().phpt       | 24 +-----
 tests/Latte/PhpWriter.formatModifiers().phpt  | 15 ----
 .../PhpWriter.optionalChainingPass().80.phpt  | 78 -------------------
 .../PhpWriter.optionalChainingPass().phpt     | 67 +---------------
 tests/Latte/Policy.properties.operators.phpt  |  6 +-
 6 files changed, 9 insertions(+), 210 deletions(-)

diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
index a9b78c2f2..7efd79657 100644
--- a/src/Latte/Compiler/PhpWriter.php
+++ b/src/Latte/Compiler/PhpWriter.php
@@ -353,36 +353,9 @@ public function optionalChainingPass(MacroTokens $tokens): MacroTokens
 
 			$addBraces = '';
 			$expr = new MacroTokens([$tokens->currentToken()]);
-			$var = $tokens->currentValue();
 
 			do {
-				if ($tokens->nextToken('?')) {
-					if ( // is it ternary operator?
-						$tokens->isNext()
-						&& (
-							!$tokens->isNext($tokens::T_CHAR)
-							|| $tokens->isNext('(', '[', '{', ':', '!', '@', '\\')
-						)
-					) {
-						$expr->append($addBraces . ' ?');
-						break;
-					}
-
-					if (!$tokens->isNext('::')) {
-						$expr->prepend('(');
-						$expr->append(' ?? null)' . $addBraces);
-						trigger_error("Syntax '$var?' is deprecated, use '$var ?? null' instead.", E_USER_DEPRECATED);
-						break;
-					}
-
-					trigger_error("Syntax '$var?::' is deprecated.", E_USER_DEPRECATED);
-					$expr->prepend('(($ʟ_tmp = ');
-					$expr->append(' ?? null) === null ? null : ');
-					$res->tokens = array_merge($res->tokens, $expr->tokens);
-					$expr = new MacroTokens('$ʟ_tmp');
-					$addBraces .= ')';
-
-				} elseif ($tokens->nextToken('?->')) {
+				if ($tokens->nextToken('?->')) {
 					if (PHP_VERSION_ID >= 80000) {
 						$expr->append($tokens->currentToken());
 						$expr->append($tokens->nextToken());
diff --git a/tests/Latte/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt
index d3bce9a58..6cfef9ae1 100644
--- a/tests/Latte/PhpWriter.formatArgs().phpt
+++ b/tests/Latte/PhpWriter.formatArgs().phpt
@@ -61,11 +61,11 @@ test('short ternary operators', function () {
 	Assert::same("fce() ? 'a' : null, fce() ? 'b' : null", formatArgs('fce() ? a, fce() ? b'));
 	Assert::same("fce() ?? 'a'", formatArgs('fce() ?? a')); // null coalesce is ignored
 	Assert::same("'a'?", formatArgs('a?')); // value must exists
-	Assert::same('$a ?(1) : null', formatArgs('$a?(1)')); // with braces
+	Assert::same('$a?(1) : null', formatArgs('$a?(1)')); // with braces
 	Assert::same('$a ? \Foo::BAR : null', formatArgs('$a ? \Foo::BAR'));
 	Assert::same('$c ?: ($a ?: $b)', formatArgs('$c ?: ($a ?: $b)'));
 	Assert::same('$c ? ($a ?: $b) : null', formatArgs('$c ? ($a ?: $b)'));
-	Assert::same('$a ?(1) : null', formatArgs('$a?(1)')); // with braces
+	Assert::same('$a?(1) : null', formatArgs('$a?(1)')); // with braces
 });
 
 
@@ -84,9 +84,6 @@ test('special', function () {
 	Assert::same("'symbol' => Namespace \\ Class :: method ()", formatArgs('symbol => Namespace \ Class :: method ()'));
 	Assert::same("'symbol' => \$this->var, ", formatArgs('symbol => $this->var, '));
 	Assert::same("'symbol' => \$this->VAR, ", formatArgs('symbol => $this->VAR, '));
-	Assert::same("'symbol' => \$this->var, ", formatArgs('symbol => $this -> var, '));
-	Assert::same("'symbol' => \$this->VAR, ", formatArgs('symbol => $this -> VAR, '));
-	Assert::same("'symbol' => \$this->var", formatArgs('symbol => $this -> var'));
 	Assert::same("'symbol1' => 'value'", formatArgs('symbol1 => /*value,* /symbol2=>*/value/**/'));
 	Assert::same('(array)', formatArgs('(array)'));
 	Assert::same('func()[1]', formatArgs('func()[1]'));
@@ -139,9 +136,6 @@ test('in operator', function () {
 
 
 test('optionalChainingPass', function () {
-	Assert::same('$a', formatArgs('$a'));
-	Assert::same('($a ?? null)', @formatArgs('$a?')); // deprecated
-	Assert::same('(($a ?? null))', @formatArgs('($a?)')); // deprecated
 	Assert::same('$var->prop->elem[1]->call(2)->item', formatArgs('$var->prop->elem[1]->call(2)->item'));
 	Assert::same(
 		PHP_VERSION_ID >= 80000
@@ -156,20 +150,6 @@ test('optionalChainingPass', function () {
 });
 
 
-test('optionalChainingPass + ternary', function () {
-	Assert::same('$a ?:$b', formatArgs('$a?:$b'));
-	Assert::same('$a ? : $b', formatArgs('$a ? : $b'));
-	Assert::same('$a ?? $b', formatArgs('$a ?? $b'));
-	Assert::same('$a ? [1, 2, ([3 ? 2 : 1])]: $b', formatArgs('$a ? [1, 2, ([3 ? 2 : 1])]: $b'));
-	Assert::same(
-		PHP_VERSION_ID >= 80000
-			? '($a?->foo ?? null) ? [1, 2, ([3 ? 2 : 1])] : $b'
-			: '(($ʟ_tmp = $a) === null ? null : ($ʟ_tmp->foo ?? null)) ? [1, 2, ([3 ? 2 : 1])] : $b',
-		@formatArgs('$a?->foo? ? [1, 2, ([3 ? 2 : 1])] : $b') // deprecated
-	);
-});
-
-
 test('named arguments', function () {
 	Assert::same('func(a: 1, b: 2)', formatArgs('func(a: 1, b: 2)'));
 	Assert::same("func(a: 1, ('a' ?'b': 2))", formatArgs('func(a: 1, (a ?b: 2))')); // ternary
diff --git a/tests/Latte/PhpWriter.formatModifiers().phpt b/tests/Latte/PhpWriter.formatModifiers().phpt
index 7b40cd4ee..5985d17ae 100644
--- a/tests/Latte/PhpWriter.formatModifiers().phpt
+++ b/tests/Latte/PhpWriter.formatModifiers().phpt
@@ -69,8 +69,6 @@ test('depth', function () {
 
 
 test('optionalChainingPass', function () {
-	Assert::same('($this->filters->mod)(@, ($a ?? null))', @formatModifiers('@', 'mod:$a?')); // deprecated
-	Assert::same('($this->filters->mod)(@, (($a ?? null)))', @formatModifiers('@', 'mod:($a?)')); // deprecated
 	Assert::same(
 		PHP_VERSION_ID >= 80000
 			? '($this->filters->mod)(@, $var?->prop?->elem[1]?->call(2)?->item)'
@@ -82,16 +80,3 @@ test('optionalChainingPass', function () {
 		formatModifiers('@', 'mod:$var??->prop??->elem[1]??->call(2)??->item')
 	);
 });
-
-
-test('optionalChainingPass + ternary', function () {
-	Assert::same('($this->filters->mod)(@, $a ?, $b)', formatModifiers('@', 'mod:$a?:$b'));
-	Assert::same('($this->filters->mod)(@, $a ? , $b)', formatModifiers('@', 'mod:$a ? : $b'));
-	Assert::same('($this->filters->mod)(@, $a ?? $b)', formatModifiers('@', 'mod:$a ?? $b'));
-	Assert::same(
-		PHP_VERSION_ID >= 80000
-			? '($this->filters->mod)(@, ($a?->foo ?? null) ? [1, 2, ([3 ? 2 : 1])] , $b)'
-			: '($this->filters->mod)(@, (($ʟ_tmp = $a) === null ? null : ($ʟ_tmp->foo ?? null)) ? [1, 2, ([3 ? 2 : 1])] , $b)',
-		@formatModifiers('@', 'mod:$a?->foo? ? [1, 2, ([3 ? 2 : 1])] : $b') // deprecated
-	);
-});
diff --git a/tests/Latte/PhpWriter.optionalChainingPass().80.phpt b/tests/Latte/PhpWriter.optionalChainingPass().80.phpt
index 1b008acd2..caaaed1c2 100644
--- a/tests/Latte/PhpWriter.optionalChainingPass().80.phpt
+++ b/tests/Latte/PhpWriter.optionalChainingPass().80.phpt
@@ -19,88 +19,10 @@ function optionalChaining($code)
 }
 
 
-test('vars', function () { // deprecated
-	Assert::same('$a', optionalChaining('$a'));
-	Assert::same('($a ?? null)', @optionalChaining('$a?'));
-	Assert::same('(($a ?? null))', @optionalChaining('($a?)'));
-	Assert::same('a?', optionalChaining('a?'));
-});
-
-
-test('indexes', function () { // deprecated
-	Assert::same('($foo[1] ?? null)', @optionalChaining('$foo[1]?'));
-	Assert::same('(($foo[1] ?? null))', @optionalChaining('($foo[1]?)'));
-});
-
-
-test('properties', function () {
-	Assert::same('$foo?->prop', optionalChaining('$foo?->prop'));
-	Assert::same('($foo->prop ?? null)', @optionalChaining('$foo->prop?')); // deprecated
-	Assert::same('($foo?->prop ?? null)', @optionalChaining('$foo?->prop?')); // deprecated
-	Assert::same('($foo?->prop ?? null) + 10', @optionalChaining('$foo?->prop? + 10')); // deprecated
-	Assert::same('($foo->prop ?? null) + 10', @optionalChaining('$foo->prop? + 10')); // deprecated
-	Assert::same('(($foo->prop ?? null))', @optionalChaining('($foo->prop?)')); // deprecated
-	Assert::same('($foo?->prop)', optionalChaining('($foo?->prop)'));
-	Assert::same('[($foo?->prop ?? null)]', @optionalChaining('[$foo?->prop?]')); // deprecated
-
-	// variable
-	Assert::same('$foo?->$prop', optionalChaining('$foo?->$prop'));
-	Assert::same('($foo->$prop ?? null)', @optionalChaining('$foo->$prop?')); // deprecated
-
-	// static
-	Assert::same('(($ʟ_tmp = $foo ?? null) === null ? null : $ʟ_tmp::$prop)', @optionalChaining('$foo?::$prop')); // deprecated
-	Assert::same('($foo::$prop ?? null)', @optionalChaining('$foo::$prop?')); // deprecated
-});
-
-
-test('calling', function () {
-	Assert::same('$foo?->call()', optionalChaining('$foo?->call()'));
-	Assert::same('($foo->call() ?? null)', @optionalChaining('$foo->call()?')); // deprecated
-	Assert::same('($foo?->call() ?? null)', @optionalChaining('$foo?->call()?')); // deprecated
-	Assert::same('($foo?->call() ?? null) + 10', @optionalChaining('$foo?->call()? + 10')); // deprecated
-	Assert::same('($foo->call() ?? null) + 10', @optionalChaining('$foo->call()? + 10')); // deprecated
-	Assert::same('(($foo->call() ?? null))', @optionalChaining('($foo->call()?)')); // deprecated
-	Assert::same('($foo?->call())', optionalChaining('($foo?->call())'));
-	Assert::same('(($foo?->call() ?? null))', @optionalChaining('($foo?->call()?)')); // deprecated
-	Assert::same('($foo?->call( ($a ?? null) ) ?? null)', @optionalChaining('$foo?->call( $a? )?')); // deprecated
-	Assert::same('($foo?->call( $a?->call() ) ?? null)', @optionalChaining('$foo?->call( $a?->call() )?')); // deprecated
-});
-
-
 test('mixed', function () {
-	Assert::same('($foo->prop ?? null) + ($foo?->prop ?? null)', @optionalChaining('$foo->prop? + $foo?->prop?')); // deprecated
-
 	Assert::same('$var->prop->elem[1]->call(2)->item', optionalChaining('$var->prop->elem[1]->call(2)->item'));
 	Assert::same('$var?->prop->elem[1]->call(2)->item', optionalChaining('$var?->prop->elem[1]->call(2)->item'));
 	Assert::same('$var->prop?->elem[1]->call(2)->item', optionalChaining('$var->prop?->elem[1]->call(2)->item'));
 	Assert::same('$var->prop->elem[1]?->call(2)->item', optionalChaining('$var->prop->elem[1]?->call(2)->item'));
 	Assert::same('$var->prop->elem[1]->call(2)?->item', optionalChaining('$var->prop->elem[1]->call(2)?->item'));
-	Assert::same('($var->prop->elem[1]->call(2)->item ?? null)', @optionalChaining('$var->prop->elem[1]->call(2)->item?')); // deprecated
-});
-
-
-test('not allowed', function () {
-	Assert::same('$foo ?(hello)', optionalChaining('$foo?(hello)'));
-	Assert::same('$foo->foo ?(hello)', optionalChaining('$foo->foo?(hello)'));
-
-	Assert::same('$foo ?[1]', optionalChaining('$foo?[1]')); // not allowed due to collision with short ternary
-
-	Assert::same('Class::$prop?', optionalChaining('Class::$prop?'));
-	Assert::same('$$var?', optionalChaining('$$var?'));
-});
-
-
-test('ternary', function () {
-	Assert::same('$a ?:$b', optionalChaining('$a?:$b'));
-	Assert::same('$a ? : $b', optionalChaining('$a ? : $b'));
-	Assert::same('$a ?? $b', optionalChaining('$a ?? $b'));
-	Assert::same('$a ? $a->a() : $a', optionalChaining('$a ? $a->a() : $a'));
-
-	Assert::same('$a ? [1, 2, ([3 ? 2 : 1])]: $b', optionalChaining('$a ? [1, 2, ([3 ? 2 : 1])]: $b'));
-	Assert::same('$a->foo ? [1, 2, ([3 ? 2 : 1])] : $b', optionalChaining('$a->foo ? [1, 2, ([3 ? 2 : 1])] : $b'));
-	Assert::same('$a?->foo ? [1, 2, ([3 ? 2 : 1])] : $b', optionalChaining('$a?->foo ? [1, 2, ([3 ? 2 : 1])] : $b'));
-	Assert::same('($a?->foo ?? null) ? [1, 2, ([3 ? 2 : 1])] : $b', @optionalChaining('$a?->foo? ? [1, 2, ([3 ? 2 : 1])] : $b')); // deprecated
-	Assert::same('($a->foo ?? null) ? [1, 2, ([3 ? 2 : 1])] : $b', @optionalChaining('$a->foo? ? [1, 2, ([3 ? 2 : 1])] : $b')); // deprecated
-
-	Assert::same('$a ? \Foo::BAR : \Foo::BAR', optionalChaining('$a ? \Foo::BAR : \Foo::BAR'));
 });
diff --git a/tests/Latte/PhpWriter.optionalChainingPass().phpt b/tests/Latte/PhpWriter.optionalChainingPass().phpt
index 50e695fee..57c6a72b4 100644
--- a/tests/Latte/PhpWriter.optionalChainingPass().phpt
+++ b/tests/Latte/PhpWriter.optionalChainingPass().phpt
@@ -19,88 +19,29 @@ function optionalChaining($code)
 }
 
 
-test('vars', function () { // deprecated
-	Assert::same('$a', optionalChaining('$a'));
-	Assert::same('($a ?? null)', @optionalChaining('$a?'));
-	Assert::same('(($a ?? null))', @optionalChaining('($a?)'));
-	Assert::same('a?', optionalChaining('a?'));
-});
-
-
-test('indexes', function () { // deprecated
-	Assert::same('($foo[1] ?? null)', @optionalChaining('$foo[1]?'));
-	Assert::same('(($foo[1] ?? null))', @optionalChaining('($foo[1]?)'));
-});
-
-
 test('properties', function () {
 	Assert::same('(($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->prop)', optionalChaining('$foo?->prop'));
-	Assert::same('($foo->prop ?? null)', @optionalChaining('$foo->prop?')); // deprecated
-	Assert::same('(($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->prop ?? null))', @optionalChaining('$foo?->prop?')); // deprecated
-	Assert::same('(($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->prop ?? null)) + 10', @optionalChaining('$foo?->prop? + 10')); // deprecated
-	Assert::same('($foo->prop ?? null) + 10', @optionalChaining('$foo->prop? + 10')); // deprecated
-	Assert::same('(($foo->prop ?? null))', @optionalChaining('($foo->prop?)')); // deprecated
+	Assert::same('(($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->prop) + 10', optionalChaining('$foo?->prop + 10'));
 	Assert::same('((($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->prop))', optionalChaining('($foo?->prop)'));
-	Assert::same('[(($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->prop ?? null))]', @optionalChaining('[$foo?->prop?]')); // deprecated
+	Assert::same('[(($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->prop)]', optionalChaining('[$foo?->prop]'));
 
 	// variable
 	Assert::same('(($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->$prop)', optionalChaining('$foo?->$prop'));
-	Assert::same('($foo->$prop ?? null)', @optionalChaining('$foo->$prop?')); // deprecated
-
-	// static
-	Assert::same('(($ʟ_tmp = $foo ?? null) === null ? null : $ʟ_tmp::$prop)', @optionalChaining('$foo?::$prop')); // deprecated
-	Assert::same('($foo::$prop ?? null)', @optionalChaining('$foo::$prop?')); // deprecated
 });
 
 
 test('calling', function () {
 	Assert::same('(($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->call())', optionalChaining('$foo?->call()'));
-	Assert::same('($foo->call() ?? null)', @optionalChaining('$foo->call()?')); // deprecated
-	Assert::same('(($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->call() ?? null))', @optionalChaining('$foo?->call()?')); // deprecated
-	Assert::same('(($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->call() ?? null)) + 10', @optionalChaining('$foo?->call()? + 10')); // deprecated
-	Assert::same('($foo->call() ?? null) + 10', @optionalChaining('$foo->call()? + 10')); // deprecated
-	Assert::same('(($foo->call() ?? null))', @optionalChaining('($foo->call()?)')); // deprecated
+	Assert::same('(($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->call()) + 10', optionalChaining('$foo?->call() + 10'));
 	Assert::same('((($ʟ_tmp = $foo) === null ? null : $ʟ_tmp->call()))', optionalChaining('($foo?->call())'));
-	Assert::same('((($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->call() ?? null)))', @optionalChaining('($foo?->call()?)')); // deprecated
-	Assert::same('(($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->call( ($a ?? null) ) ?? null))', @optionalChaining('$foo?->call( $a? )?')); // deprecated
-	Assert::same('(($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->call( (($ʟ_tmp = $a) === null ? null : $ʟ_tmp->call()) ) ?? null))', @optionalChaining('$foo?->call( $a?->call() )?')); // deprecated
+	Assert::same('(($ʟ_tmp = $foo) === null ? null : (($ʟ_tmp = $ʟ_tmp->call( (($ʟ_tmp = $a) === null ? null : $ʟ_tmp->call()) )) === null ? null : $ʟ_tmp->x))', optionalChaining('$foo?->call( $a?->call() )?->x'));
 });
 
 
 test('mixed', function () {
-	Assert::same('($foo->prop ?? null) + (($ʟ_tmp = $foo) === null ? null : ($ʟ_tmp->prop ?? null))', @optionalChaining('$foo->prop? + $foo?->prop?')); // deprecated
-
 	Assert::same('$var->prop->elem[1]->call(2)->item', optionalChaining('$var->prop->elem[1]->call(2)->item'));
 	Assert::same('(($ʟ_tmp = $var) === null ? null : $ʟ_tmp->prop->elem[1]->call(2)->item)', optionalChaining('$var?->prop->elem[1]->call(2)->item'));
 	Assert::same('(($ʟ_tmp = $var->prop) === null ? null : $ʟ_tmp->elem[1]->call(2)->item)', optionalChaining('$var->prop?->elem[1]->call(2)->item'));
 	Assert::same('(($ʟ_tmp = $var->prop->elem[1]) === null ? null : $ʟ_tmp->call(2)->item)', optionalChaining('$var->prop->elem[1]?->call(2)->item'));
 	Assert::same('(($ʟ_tmp = $var->prop->elem[1]->call(2)) === null ? null : $ʟ_tmp->item)', optionalChaining('$var->prop->elem[1]->call(2)?->item'));
-	Assert::same('($var->prop->elem[1]->call(2)->item ?? null)', @optionalChaining('$var->prop->elem[1]->call(2)->item?')); // deprecated
-});
-
-
-test('not allowed', function () {
-	Assert::same('$foo ?(hello)', optionalChaining('$foo?(hello)'));
-	Assert::same('$foo->foo ?(hello)', optionalChaining('$foo->foo?(hello)'));
-
-	Assert::same('$foo ?[1]', optionalChaining('$foo?[1]')); // not allowed due to collision with short ternary
-
-	Assert::same('Class::$prop?', optionalChaining('Class::$prop?'));
-	Assert::same('$$var?', optionalChaining('$$var?'));
-});
-
-
-test('ternary', function () {
-	Assert::same('$a ?:$b', optionalChaining('$a?:$b'));
-	Assert::same('$a ? : $b', optionalChaining('$a ? : $b'));
-	Assert::same('$a ?? $b', optionalChaining('$a ?? $b'));
-	Assert::same('$a ? $a->a() : $a', optionalChaining('$a ? $a->a() : $a'));
-
-	Assert::same('$a ? [1, 2, ([3 ? 2 : 1])]: $b', optionalChaining('$a ? [1, 2, ([3 ? 2 : 1])]: $b'));
-	Assert::same('$a->foo ? [1, 2, ([3 ? 2 : 1])] : $b', optionalChaining('$a->foo ? [1, 2, ([3 ? 2 : 1])] : $b'));
-	Assert::same('(($ʟ_tmp = $a) === null ? null : $ʟ_tmp->foo) ? [1, 2, ([3 ? 2 : 1])] : $b', optionalChaining('$a?->foo ? [1, 2, ([3 ? 2 : 1])] : $b'));
-	Assert::same('(($ʟ_tmp = $a) === null ? null : ($ʟ_tmp->foo ?? null)) ? [1, 2, ([3 ? 2 : 1])] : $b', @optionalChaining('$a?->foo? ? [1, 2, ([3 ? 2 : 1])] : $b')); // deprecated
-	Assert::same('($a->foo ?? null) ? [1, 2, ([3 ? 2 : 1])] : $b', @optionalChaining('$a->foo? ? [1, 2, ([3 ? 2 : 1])] : $b')); // deprecated
-
-	Assert::same('$a ? \Foo::BAR : \Foo::BAR', optionalChaining('$a ? \Foo::BAR : \Foo::BAR'));
 });
diff --git a/tests/Latte/Policy.properties.operators.phpt b/tests/Latte/Policy.properties.operators.phpt
index a20dd479c..354f23a49 100644
--- a/tests/Latte/Policy.properties.operators.phpt
+++ b/tests/Latte/Policy.properties.operators.phpt
@@ -39,11 +39,10 @@ $template = <<<'EOD'
 
 {=$obj?->bar}
 {=$obj?->$prop}
-{=$obj?::$static}
 {=$obj??->bar}
 EOD;
 
-@$latte->compile($template);
+$latte->compile($template);
 Assert::equal(
 	[
 		'macros' => Expect::type('array'),
@@ -52,7 +51,7 @@ Assert::equal(
 );
 
 
-@$latte->renderToString($template);
+$latte->renderToString($template);
 Assert::equal(
 	[
 		'macros' => Expect::type('array'),
@@ -64,7 +63,6 @@ Assert::equal(
 			['MyClass', 'static'],
 			['MyClass', 'bar'],
 			['MyClass', 'bar'],
-			['MyClass', 'static'],
 			['MyClass', 'bar'],
 		],
 	],

From 29bee5344536a48b34a39209d55c0293e0ff63a4 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 3 Nov 2020 00:38:47 +0100
Subject: [PATCH 11/20] PhpWriter: supports named arguments in modifiers (in
 PHP 8)

---
 src/Latte/Compiler/PhpWriter.php             | 3 +--
 tests/Latte/PhpWriter.formatArgs().phpt      | 5 +++--
 tests/Latte/PhpWriter.formatModifiers().phpt | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
index 7efd79657..f7ab29244 100644
--- a/src/Latte/Compiler/PhpWriter.php
+++ b/src/Latte/Compiler/PhpWriter.php
@@ -761,9 +761,8 @@ public function modifierPass(MacroTokens $tokens, $var, bool $isContent = false)
 					&& $tokens->isPrev(',', ':')
 					&& $tokens->isNext(':')
 				) {
-					$hint = (clone $tokens)->reset()->joinAll();
-					trigger_error("Colon as argument separator is deprecated, use comma in '$hint'.", E_USER_DEPRECATED);
 					$res->append($tokens->currentToken());
+					$res->append($tokens->nextToken(':'));
 
 				} else {
 					$res->append($tokens->currentToken());
diff --git a/tests/Latte/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt
index 6cfef9ae1..cc98e8c4c 100644
--- a/tests/Latte/PhpWriter.formatArgs().phpt
+++ b/tests/Latte/PhpWriter.formatArgs().phpt
@@ -111,8 +111,8 @@ test('inline modifiers', function () {
 
 	Assert::same("'foo' => (\$this->filters->mod)(\$val, 'param', \"param2)\")", formatArgs('foo => ($val|mod:param,"param2)")'));
 	Assert::same("'foo' => (\$this->filters->mod2)((\$this->filters->mod)(\$val))", formatArgs('foo => ($val|mod|mod2)'));
-	Assert::same("'foo' => (\$this->filters->mod)(\$val, 'param', (\$this->filters->mod2)(1))", @formatArgs('foo => ($val|mod:param:(1|mod2))')); // deprecated :
-	Assert::same("'foo' => (\$this->filters->mod)(\$val, 'param', (\$this->filters->mod2)(1, round((\$this->filters->foo)(2))))", @formatArgs('foo => ($val|mod:param:(1|mod2:round((2|foo))))')); // deprecated :
+	Assert::same("'foo' => (\$this->filters->mod)(\$val, 'param', (\$this->filters->mod2)(1))", formatArgs('foo => ($val|mod:param,(1|mod2))'));
+	Assert::same("'foo' => (\$this->filters->mod)(\$val, 'param', (\$this->filters->mod2)(1, round((\$this->filters->foo)(2))))", formatArgs('foo => ($val|mod:param,(1|mod2:round((2|foo))))'));
 	Assert::same("'foo' => foo(\$val)", formatArgs('foo => foo($val)'));
 	Assert::same("'foo' => foo((\$this->filters->bar)(\$val))", formatArgs('foo => foo($val|bar)'));
 	Assert::same('foo(($this->filters->bar)($val),($this->filters->lorem)( $val))', formatArgs('foo($val|bar, $val|lorem)'));
@@ -154,6 +154,7 @@ test('named arguments', function () {
 	Assert::same('func(a: 1, b: 2)', formatArgs('func(a: 1, b: 2)'));
 	Assert::same("func(a: 1, ('a' ?'b': 2))", formatArgs('func(a: 1, (a ?b: 2))')); // ternary
 	Assert::same("a: 1, 'a' ? 'b': 2", formatArgs('a: 1, a ? b: 2'));
+	Assert::same('\'foo\' => ($this->filters->mod)($val, param:($this->filters->mod2)(1))', formatArgs('foo => ($val|mod:param:(1|mod2))'));
 });
 
 
diff --git a/tests/Latte/PhpWriter.formatModifiers().phpt b/tests/Latte/PhpWriter.formatModifiers().phpt
index 5985d17ae..91a84f5a5 100644
--- a/tests/Latte/PhpWriter.formatModifiers().phpt
+++ b/tests/Latte/PhpWriter.formatModifiers().phpt
@@ -41,12 +41,11 @@ test('common', function () {
 
 test('arguments', function () {
 	Assert::same('($this->filters->mod)(@, $obj->a, 2)', formatModifiers('@', 'mod:$obj->a:2'));
-	Assert::same('($this->filters->mod)(@, \'arg1\', 2, $var["pocet"])', @formatModifiers('@', 'mod:arg1:2:$var["pocet"]')); // deprecated :
 	Assert::same('($this->filters->mod)(@, \'arg1\', 2, $var["pocet"])', formatModifiers('@', 'mod,arg1,2,$var["pocet"]'));
 	Assert::same('($this->filters->mod)(@, " :a:b:c", "", 3, "")', @formatModifiers('@', 'mod:" :a:b:c":"":3:""')); // deprecated :
 	Assert::same('($this->filters->mod)(@, "\":a:b:c")', formatModifiers('@', 'mod:"\\":a:b:c"'));
 	Assert::same("(\$this->filters->mod)(@, '\\':a:b:c')", formatModifiers('@', "mod:'\\':a:b:c'"));
-	Assert::same('($this->filters->mod)(@ , \'param\' , \'param\')', @formatModifiers('@', 'mod : param : param')); // deprecated :
+	Assert::same('($this->filters->mod)(@ , \'param\' , \'param\')', formatModifiers('@', 'mod : param , param'));
 	Assert::same('($this->filters->mod)(@, $var, 0, -0.0, "str", \'str\')', formatModifiers('@', 'mod, $var, 0, -0.0, "str", \'str\''));
 	Assert::same('($this->filters->mod)(@, true, false, null)', formatModifiers('@', 'mod: true, false, null'));
 	Assert::same('($this->filters->mod)(@, TRUE, FALSE, NULL)', formatModifiers('@', 'mod: TRUE, FALSE, NULL'));
@@ -80,3 +79,9 @@ test('optionalChainingPass', function () {
 		formatModifiers('@', 'mod:$var??->prop??->elem[1]??->call(2)??->item')
 	);
 });
+
+
+test('named arguments', function () {
+	Assert::same('($this->filters->mod)(@, a: 1)', formatModifiers('@', 'mod:a: 1'));
+	Assert::same('($this->filters->mod)(@, a: 1, b: 2)', formatModifiers('@', 'mod:a: 1, b: 2'));
+});

From 9790492b2868f43c3b1d5c00688cdd1b14bb15d4 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 3 Nov 2020 00:50:17 +0100
Subject: [PATCH 12/20] Colons as argument separator in modifiers are
 deprecated everywhere (BC break)

It will be replaced by named arguments
---
 src/Latte/Compiler/PhpWriter.php             | 4 ++++
 tests/Latte/PhpWriter.formatArgs().phpt      | 1 -
 tests/Latte/PhpWriter.formatModifiers().phpt | 9 ++++-----
 tests/Latte/templates/filters.general.latte  | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
index f7ab29244..5e49dba04 100644
--- a/src/Latte/Compiler/PhpWriter.php
+++ b/src/Latte/Compiler/PhpWriter.php
@@ -765,6 +765,10 @@ public function modifierPass(MacroTokens $tokens, $var, bool $isContent = false)
 					$res->append($tokens->nextToken(':'));
 
 				} else {
+					if ($tokens->isNext(':') && !$tokens->depth) {
+						$hint = (clone $tokens)->reset()->joinAll();
+						trigger_error("Colon as argument separator is deprecated, use comma in '$hint'.", E_USER_DEPRECATED);
+					}
 					$res->append($tokens->currentToken());
 				}
 			} elseif ($tokens->isCurrent($tokens::T_SYMBOL)) {
diff --git a/tests/Latte/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt
index cc98e8c4c..0796d79e5 100644
--- a/tests/Latte/PhpWriter.formatArgs().phpt
+++ b/tests/Latte/PhpWriter.formatArgs().phpt
@@ -103,7 +103,6 @@ test('inline modifiers', function () {
 	Assert::same('($this->filters->mod)(@)', formatArgs('(@|mod)'));
 	Assert::same('($this->filters->mod3)(($this->filters->mod2)(($this->filters->mod1)(@)))', formatArgs('(@|mod1|mod2|mod3)'));
 	Assert::same('($this->filters->mod3)(($this->filters->mod2)(($this->filters->mod1)(@)))', formatArgs('((@|mod1)|mod2|mod3)'));
-	Assert::same('($this->filters->mod)(@, 1, 2, $var["pocet"])', formatArgs('(@|mod:1:2:$var["pocet"])'));
 	Assert::same('($this->filters->mod)(@, 1, 2, $var["pocet"])', formatArgs('(@|mod,1,2,$var["pocet"])'));
 	Assert::same('($this->filters->mod)(@, $var, 0, -0.0, "s\"\'tr", \'s"\\\'tr\')', formatArgs('(@|mod, $var, 0, -0.0, "s\"\'tr", \'s"\\\'tr\')'));
 	Assert::same('($this->filters->mod)(@, array(1))', formatArgs('(@|mod: array(1))'));
diff --git a/tests/Latte/PhpWriter.formatModifiers().phpt b/tests/Latte/PhpWriter.formatModifiers().phpt
index 91a84f5a5..4550f5c60 100644
--- a/tests/Latte/PhpWriter.formatModifiers().phpt
+++ b/tests/Latte/PhpWriter.formatModifiers().phpt
@@ -40,12 +40,11 @@ test('common', function () {
 
 
 test('arguments', function () {
-	Assert::same('($this->filters->mod)(@, $obj->a, 2)', formatModifiers('@', 'mod:$obj->a:2'));
 	Assert::same('($this->filters->mod)(@, \'arg1\', 2, $var["pocet"])', formatModifiers('@', 'mod,arg1,2,$var["pocet"]'));
-	Assert::same('($this->filters->mod)(@, " :a:b:c", "", 3, "")', @formatModifiers('@', 'mod:" :a:b:c":"":3:""')); // deprecated :
-	Assert::same('($this->filters->mod)(@, "\":a:b:c")', formatModifiers('@', 'mod:"\\":a:b:c"'));
-	Assert::same("(\$this->filters->mod)(@, '\\':a:b:c')", formatModifiers('@', "mod:'\\':a:b:c'"));
-	Assert::same('($this->filters->mod)(@ , \'param\' , \'param\')', formatModifiers('@', 'mod : param , param'));
+	Assert::same('($this->filters->mod)(@, " ,a,b,c", "", 3, "")', @formatModifiers('@', 'mod:" ,a,b,c","",3,""'));
+	Assert::same('($this->filters->mod)(@, "\",a,b,c")', formatModifiers('@', 'mod:"\\",a,b,c"'));
+	Assert::same("(\$this->filters->mod)(@, '\\',a,b,c')", formatModifiers('@', "mod:'\\',a,b,c'"));
+	Assert::same('($this->filters->mod)(@ , \'param\' , \'param\')', @formatModifiers('@', 'mod , param , param'));
 	Assert::same('($this->filters->mod)(@, $var, 0, -0.0, "str", \'str\')', formatModifiers('@', 'mod, $var, 0, -0.0, "str", \'str\''));
 	Assert::same('($this->filters->mod)(@, true, false, null)', formatModifiers('@', 'mod: true, false, null'));
 	Assert::same('($this->filters->mod)(@, TRUE, FALSE, NULL)', formatModifiers('@', 'mod: TRUE, FALSE, NULL'));
diff --git a/tests/Latte/templates/filters.general.latte b/tests/Latte/templates/filters.general.latte
index ee2a7ba0c..a228dc804 100644
--- a/tests/Latte/templates/filters.general.latte
+++ b/tests/Latte/templates/filters.general.latte
@@ -23,7 +23,7 @@
 
 <ul>
 	<li>{(int)$hello*0 |types:0,0.0,"0"}</li>
-	<li>{(int)$hello*1 |types:1:"1"}</li>
+	<li>{(int)$hello*1 |types:1,"1"}</li>
 	<li>{$hello |types:true,null,false}</li>
 	<li>{$hello |types:TRUE,NULL,FALSE}</li>
 	<li>{$hello |types:'',"","$hello"}</li>
@@ -73,5 +73,5 @@ Nested blocks: {block|striphtml|truncate:20} Outer   {block|striphtml|upper} Inn
 
 <ul>
 	<li>padLeft: {$hello |padleft:20}</li>
-	<li>padRight: {$hello |padright:20:'*'}</li>
+	<li>padRight: {$hello |padright:20,'*'}</li>
 </ul>

From 1dabdcf84720e354160f44401afe03e9df56c8f6 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 25 May 2020 12:59:59 +0200
Subject: [PATCH 13/20] Auto-empty is deprecated

---
 src/Latte/Compiler/Compiler.php           |  4 ++++
 src/Latte/Macro.php                       |  2 +-
 tests/Latte/Compiler.flag.AUTO_EMPTY.phpt | 14 +++++++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
index b8a43ea78..a0dea8573 100644
--- a/src/Latte/Compiler/Compiler.php
+++ b/src/Latte/Compiler/Compiler.php
@@ -416,6 +416,10 @@ private function processMacroTag(Token $token): void
 					&& ($t->type !== Token::MACRO_TAG || $t->name !== $token->name)
 					&& ($t->type !== Token::HTML_ATTRIBUTE_BEGIN || $t->name !== Parser::N_PREFIX . $token->name));
 				$token->empty = $t ? !$t->closing : true;
+				if ($token->empty) {
+					$tmp = substr($token->text, 0, -1) . ' /}';
+					trigger_error("Auto-empty behaviour is deprecated, replace {$token->text} with $tmp in line " . $this->getLine(), E_USER_DEPRECATED);
+				}
 			}
 			$node = $this->openMacro($token->name, $token->value, $token->modifiers, $isRightmost);
 			if ($token->empty) {
diff --git a/src/Latte/Macro.php b/src/Latte/Macro.php
index 2513356e0..d9b2562e2 100644
--- a/src/Latte/Macro.php
+++ b/src/Latte/Macro.php
@@ -16,7 +16,7 @@
 interface Macro
 {
 	const
-		AUTO_EMPTY = 4,
+		AUTO_EMPTY = 4, // deprecated
 		AUTO_CLOSE = 64,
 		ALLOWED_IN_HEAD = 128,
 		DEFAULT_FLAGS = 0;
diff --git a/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt b/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt
index 50e679388..6bd515f2c 100644
--- a/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt
+++ b/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt
@@ -47,24 +47,28 @@ $latte->getCompiler()->addMacro('test_auto', $macro, Macro::AUTO_EMPTY);
 $latte->compile('{test_auto} ... {/test_auto}');
 Assert::same(' ... ', $macro->nodes[0]->content);
 
-$latte->compile('{test_auto}');
+Assert::error(function () use ($latte) {
+	$latte->compile('{test_auto}');
+}, E_USER_DEPRECATED, 'Auto-empty behaviour is deprecated, replace {test_auto} with {test_auto /} in line 1');
+
+@$latte->compile('{test_auto}'); // deprecated
 Assert::same('', $macro->nodes[0]->content);
 
 $latte->compile('{test_auto} {if true} {/if} {/test_auto}');
 Assert::match('%A% if (true) %A%', $macro->nodes[0]->content);
 
-$latte->compile('{test_auto} {test_auto} ... {/test_auto}');
+@$latte->compile('{test_auto} {test_auto} ... {/test_auto}'); // deprecated
 Assert::same('', $macro->nodes[0]->content);
 Assert::same(' ... ', $macro->nodes[1]->content);
 
-$latte->compile('{test_auto} <div n:test_auto></div>');
+@$latte->compile('{test_auto} <div n:test_auto></div>'); // deprecated
 Assert::same('', $macro->nodes[0]->content);
 Assert::match('<div%A%</div>', $macro->nodes[1]->content);
 
 Assert::exception(function () use ($latte) {
-	$latte->compile('{test_auto} <div n:test_auto>');
+	@$latte->compile('{test_auto} <div n:test_auto>'); // deprecated
 }, Latte\CompileException::class, 'Missing </div> for n:test_auto');
 
 Assert::exception(function () use ($latte) {
-	$latte->compile('{test_auto} <div n:test_auto></div> {/test_auto}');
+	@$latte->compile('{test_auto} <div n:test_auto></div> {/test_auto}'); // deprecated
 }, Latte\CompileException::class, 'Unexpected {/test_auto}');

From 32790007415808a2c10494d6fb36aa1b49a0fdaa Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 15 Jun 2020 15:41:35 +0200
Subject: [PATCH 14/20] Empty closing macro {/} is deprecated

---
 src/Latte/Compiler/Compiler.php             |  4 ++++
 tests/Latte/BlockMacros.include.block.phpt  | 16 ++++++++--------
 tests/Latte/Compiler.macro.lines.phpt       |  2 +-
 tests/Latte/templates/filters.general.latte |  2 +-
 tests/Latte/templates/general.latte         |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
index a0dea8573..da202aeca 100644
--- a/src/Latte/Compiler/Compiler.php
+++ b/src/Latte/Compiler/Compiler.php
@@ -653,6 +653,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
index a680cc13c..ca4819929 100644
--- 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
index 8d31374f5..055103d6f 100644
--- 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
index a228dc804..c27e5f1fa 100644
--- 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
index 011627b84..9a1145ab9 100644
--- 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}

From 814db4169c632e8c476f5f29dbc865190642afa0 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sun, 15 Nov 2020 21:23:35 +0100
Subject: [PATCH 15/20] phpdoc wip

---
 phpstan.neon                              |  2 +-
 src/Latte/Macros/CoreMacros.php           |  3 +-
 src/Latte/Runtime/Filters.php             | 95 ++++++++---------------
 src/Latte/Runtime/Html.php                |  3 +
 src/Latte/Runtime/SnippetBridge.php       |  1 +
 tests/Latte/Filters.htmlAttributes().phpt |  2 -
 6 files changed, 40 insertions(+), 66 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index d7357c01a..0dfd65548 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-	level: 5
+	level: 6
 
 	paths:
 		- src
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
index fcb7012a5..3a0abbf13 100644
--- a/src/Latte/Macros/CoreMacros.php
+++ b/src/Latte/Macros/CoreMacros.php
@@ -98,9 +98,8 @@ public static function install(Latte\Compiler $compiler): void
 
 	/**
 	 * Initializes before template parsing.
-	 * @return void
 	 */
-	public function initialize()
+	public function initialize(): void
 	{
 		$this->overwrittenVars = [];
 		$this->idCounter = 0;
diff --git a/src/Latte/Runtime/Filters.php b/src/Latte/Runtime/Filters.php
index e39f6a345..9eb4ae5c2 100644
--- a/src/Latte/Runtime/Filters.php
+++ b/src/Latte/Runtime/Filters.php
@@ -21,17 +21,16 @@
  */
 class Filters
 {
-	/** @deprecated */
+	/** @var string  @deprecated */
 	public static $dateFormat = '%x';
 
-	/** @internal @var bool  use XHTML syntax? */
+	/** @var bool  @internal use XHTML syntax? */
 	public static $xhtml = false;
 
 
 	/**
 	 * Escapes string for use everywhere inside HTML (except for comments).
-	 * @param  mixed  $s  plain text
-	 * @return string HTML
+	 * @param  string|int|float  $s
 	 */
 	public static function escapeHtml($s): string
 	{
@@ -41,8 +40,7 @@ public static function escapeHtml($s): string
 
 	/**
 	 * Escapes string for use inside HTML text.
-	 * @param  mixed  $s  plain text or HtmlStringable
-	 * @return string HTML
+	 * @param  string|int|float|HtmlStringable|\Nette\Utils\IHtmlString  $s
 	 */
 	public static function escapeHtmlText($s): string
 	{
@@ -57,8 +55,7 @@ public static function escapeHtmlText($s): string
 
 	/**
 	 * Escapes string for use inside HTML attribute value.
-	 * @param  mixed  $s  plain text
-	 * @return string HTML
+	 * @param  string|int|float|HtmlStringable|\Nette\Utils\IHtmlString  $s
 	 */
 	public static function escapeHtmlAttr($s, bool $double = true): string
 	{
@@ -73,8 +70,7 @@ public static function escapeHtmlAttr($s, bool $double = true): string
 
 	/**
 	 * Escapes HTML for use inside HTML attribute.
-	 * @param  mixed  $s  HTML text
-	 * @return string HTML
+	 * @param  string|int|float  $s  HTML text
 	 */
 	public static function escapeHtmlAttrConv($s): string
 	{
@@ -84,8 +80,7 @@ public static function escapeHtmlAttrConv($s): string
 
 	/**
 	 * Escapes string for use inside HTML attribute name.
-	 * @param  string  $s  plain text
-	 * @return string HTML
+	 * @param  string|int|float  $s
 	 */
 	public static function escapeHtmlAttrUnquoted($s): string
 	{
@@ -98,8 +93,7 @@ public static function escapeHtmlAttrUnquoted($s): string
 
 	/**
 	 * Escapes string for use inside HTML/XML comments.
-	 * @param  string  $s  plain text
-	 * @return string HTML
+	 * @param  string|int|float  $s
 	 */
 	public static function escapeHtmlComment($s): string
 	{
@@ -117,8 +111,7 @@ public static function escapeHtmlComment($s): string
 
 	/**
 	 * Escapes string for use everywhere inside XML (except for comments).
-	 * @param  string  $s  plain text
-	 * @return string XML
+	 * @param  string|int|float  $s
 	 */
 	public static function escapeXml($s): string
 	{
@@ -132,8 +125,7 @@ public static function escapeXml($s): string
 
 	/**
 	 * Escapes string for use inside XML attribute name.
-	 * @param  string  $s  plain text
-	 * @return string XML
+	 * @param  string|int|float  $s
 	 */
 	public static function escapeXmlAttrUnquoted($s): string
 	{
@@ -146,8 +138,7 @@ public static function escapeXmlAttrUnquoted($s): string
 
 	/**
 	 * Escapes string for use inside CSS template.
-	 * @param  string  $s  plain text
-	 * @return string CSS
+	 * @param  string|int|float  $s
 	 */
 	public static function escapeCss($s): string
 	{
@@ -158,8 +149,7 @@ public static function escapeCss($s): string
 
 	/**
 	 * Escapes variables for use inside <script>.
-	 * @param  mixed  $s  plain text
-	 * @return string JSON
+	 * @param  mixed  $s
 	 */
 	public static function escapeJs($s): string
 	{
@@ -178,7 +168,7 @@ public static function escapeJs($s): string
 
 	/**
 	 * Escapes string for use inside iCal template.
-	 * @param  string  $s  plain text
+	 * @param  string|int|float  $s
 	 */
 	public static function escapeICal($s): string
 	{
@@ -191,8 +181,7 @@ public static function escapeICal($s): string
 
 	/**
 	 * Escapes CSS/JS for usage in <script> and <style>..
-	 * @param  string  $s  CSS/JS
-	 * @return string HTML RAWTEXT
+	 * @param  string|int|float  $s  CSS/JS
 	 */
 	public static function escapeHtmlRawText($s): string
 	{
@@ -202,8 +191,7 @@ public static function escapeHtmlRawText($s): string
 
 	/**
 	 * Converts HTML to plain text.
-	 * @param  string  $s  HTML
-	 * @return string plain text
+	 * @param  string|int|float  $s  HTML
 	 */
 	public static function stripHtml(FilterInfo $info, $s): string
 	{
@@ -215,8 +203,7 @@ public static function stripHtml(FilterInfo $info, $s): string
 
 	/**
 	 * Removes tags from HTML (but remains HTML entites).
-	 * @param  string  $s  HTML
-	 * @return string HTML
+	 * @param  string|int|float  $s  HTML
 	 */
 	public static function stripTags(FilterInfo $info, $s): string
 	{
@@ -228,6 +215,7 @@ public static function stripTags(FilterInfo $info, $s): string
 
 	/**
 	 * Converts ... to ...
+	 * @param  HtmlStringable|string|int|float  $s
 	 */
 	public static function convertTo(FilterInfo $info, string $dest, $s): string
 	{
@@ -293,8 +281,7 @@ public static function getConvertor(string $source, string $dest): ?callable
 
 	/**
 	 * Sanitizes string for use inside href attribute.
-	 * @param  string  $s  plain text
-	 * @return string plain text
+	 * @param  string|int|float  $s
 	 */
 	public static function safeUrl($s): string
 	{
@@ -304,9 +291,7 @@ public static function safeUrl($s): string
 
 
 	/**
-	 * Replaces all repeated white spaces with a single space.
-	 * @param  string  $s  text|HTML
-	 * @return string text|HTML
+	 * Replaces all repeated white spaces with a single space in plain text or HTML.
 	 */
 	public static function strip(FilterInfo $info, string $s): string
 	{
@@ -318,9 +303,6 @@ public static function strip(FilterInfo $info, string $s): string
 
 	/**
 	 * Replaces all repeated white spaces with a single space.
-	 * @param  string  $s  HTML
-	 * @param  bool  $strip  stripping mode
-	 * @return string HTML
 	 */
 	public static function spacelessHtml(string $s, bool &$strip = true): string
 	{
@@ -364,7 +346,6 @@ public static function spacelessHtmlHandler(string $s, int $phase = null): strin
 
 	/**
 	 * Replaces all repeated white spaces with a single space.
-	 * @return string text
 	 */
 	public static function spacelessText(string $s): string
 	{
@@ -419,7 +400,7 @@ public static function explode(string $value, string $separator = ''): array
 
 	/**
 	 * Repeats text.
-	 * @return string plain text
+	 * @param  string|int|float  $s
 	 */
 	public static function repeat(FilterInfo $info, $s, int $count): string
 	{
@@ -459,7 +440,6 @@ public static function date($time, string $format = null): ?string
 
 	/**
 	 * Converts to human readable file size.
-	 * @return string plain text
 	 */
 	public static function bytes(float $bytes, int $precision = 2): string
 	{
@@ -511,7 +491,6 @@ public static function replaceRe(string $subject, string $pattern, string $repla
 
 	/**
 	 * The data: URI generator.
-	 * @return string plain text
 	 */
 	public static function dataStream(string $data, string $type = null): string
 	{
@@ -523,7 +502,7 @@ public static function dataStream(string $data, string $type = null): string
 
 
 	/**
-	 * @param  string  $s  plain text
+	 * @param  string|int|float  $s
 	 */
 	public static function breaklines($s): Html
 	{
@@ -533,6 +512,7 @@ public static function breaklines($s): Html
 
 	/**
 	 * Returns a part of string.
+	 * @param  string|\Stringable  $s
 	 */
 	public static function substring($s, int $start, int $length = null): string
 	{
@@ -549,9 +529,9 @@ public static function substring($s, int $start, int $length = null): string
 
 	/**
 	 * Truncates string to maximal length.
-	 * @return string plain text
+	 * @param  string|int|float  $s
 	 */
-	public static function truncate($s, $length, $append = "\u{2026}"): string
+	public static function truncate($s, int $length, string $append = "\u{2026}"): string
 	{
 		$s = (string) $s;
 		if (self::strLength($s) > $length) {
@@ -572,8 +552,6 @@ public static function truncate($s, $length, $append = "\u{2026}"): string
 
 	/**
 	 * Convert to lower case.
-	 * @param  string  $s  plain text
-	 * @return string plain text
 	 */
 	public static function lower($s): string
 	{
@@ -583,8 +561,6 @@ public static function lower($s): string
 
 	/**
 	 * Convert to upper case.
-	 * @param  string  $s  plain text
-	 * @return string plain text
 	 */
 	public static function upper($s): string
 	{
@@ -594,8 +570,6 @@ public static function upper($s): string
 
 	/**
 	 * Convert first character to upper case.
-	 * @param  string  $s  plain text
-	 * @return string plain text
 	 */
 	public static function firstUpper($s): string
 	{
@@ -606,8 +580,6 @@ public static function firstUpper($s): string
 
 	/**
 	 * Capitalize string.
-	 * @param  string  $s  plain text
-	 * @return string plain text
 	 */
 	public static function capitalize($s): string
 	{
@@ -617,7 +589,7 @@ public static function capitalize($s): string
 
 	/**
 	 * Returns length of string or iterable.
-	 * @param  array|\Countable|\Traversable|string  $val
+	 * @param  mixed[]|\Countable|\Traversable|string  $val
 	 */
 	public static function length($val): int
 	{
@@ -642,7 +614,7 @@ private static function strLength(string $s): int
 	/**
 	 * Strips whitespace.
 	 */
-	public static function trim(FilterInfo $info, $s, string $charlist = " \t\n\r\0\x0B\u{A0}"): string
+	public static function trim(FilterInfo $info, string $s, string $charlist = " \t\n\r\0\x0B\u{A0}"): string
 	{
 		$charlist = preg_quote($charlist, '#');
 		$s = preg_replace('#^[' . $charlist . ']+|[' . $charlist . ']+$#Du', '', (string) $s);
@@ -655,6 +627,7 @@ public static function trim(FilterInfo $info, $s, string $charlist = " \t\n\r\0\
 
 	/**
 	 * Pad a string to a certain length with another string.
+	 * @param  string|int|float  $s
 	 */
 	public static function padLeft($s, int $length, string $append = ' '): string
 	{
@@ -667,6 +640,7 @@ public static function padLeft($s, int $length, string $append = ' '): string
 
 	/**
 	 * Pad a string to a certain length with another string.
+	 * @param  string|int|float  $s
 	 */
 	public static function padRight($s, int $length, string $append = ' '): string
 	{
@@ -679,7 +653,8 @@ public static function padRight($s, int $length, string $append = ' '): string
 
 	/**
 	 * Reverses string or array.
-	 * @param  string|array|\Traversable  $val
+	 * @param  string|mixed[]|\Traversable  $val
+	 * @return string|mixed[]
 	 */
 	public static function reverse($val, bool $preserveKeys = false)
 	{
@@ -695,7 +670,8 @@ public static function reverse($val, bool $preserveKeys = false)
 
 	/**
 	 * Chunks items by returning an array of arrays with the given number of items.
-	 * @param  array|\Traversable  $list
+	 * @param  mixed[]|\Traversable  $list
+	 * @param  mixed  $rest
 	 */
 	public static function batch($list, int $length, $rest = null): \Generator
 	{
@@ -862,13 +838,10 @@ public static function random($values)
 
 	/**
 	 * Returns element's attributes.
+	 * @param  array<(string|bool|array|null)>  $attrs
 	 */
-	public static function htmlAttributes($attrs): string
+	public static function htmlAttributes(array $attrs): string
 	{
-		if (!is_array($attrs)) {
-			return '';
-		}
-
 		$s = '';
 		foreach ($attrs as $key => $value) {
 			if ($value === null || $value === false) {
diff --git a/src/Latte/Runtime/Html.php b/src/Latte/Runtime/Html.php
index ad29d2440..14936e193 100644
--- a/src/Latte/Runtime/Html.php
+++ b/src/Latte/Runtime/Html.php
@@ -23,6 +23,9 @@ class Html implements HtmlStringable
 	private $value;
 
 
+	/**
+	 * @param scalar  $value
+	 */
 	public function __construct($value)
 	{
 		$this->value = (string) $value;
diff --git a/src/Latte/Runtime/SnippetBridge.php b/src/Latte/Runtime/SnippetBridge.php
index 8d3428d06..821d98489 100644
--- a/src/Latte/Runtime/SnippetBridge.php
+++ b/src/Latte/Runtime/SnippetBridge.php
@@ -18,6 +18,7 @@ interface SnippetBridge
 {
 	function isSnippetMode(): bool;
 
+	/** @return void */
 	function setSnippetMode(bool $snippetMode);
 
 	function needsRedraw(string $name): bool;
diff --git a/tests/Latte/Filters.htmlAttributes().phpt b/tests/Latte/Filters.htmlAttributes().phpt
index 08c6cef24..05fb16534 100644
--- a/tests/Latte/Filters.htmlAttributes().phpt
+++ b/tests/Latte/Filters.htmlAttributes().phpt
@@ -13,8 +13,6 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::same('', Filters::htmlAttributes(null));
-
 Assert::same(' style="float:left" class="three" a=\'<>"\' b="\'" title="0" checked', Filters::htmlAttributes([
 	'style' => 'float:left',
 	'class' => 'three',

From 6a67fe671c6897b79cbfc524947db83a77d0b00b Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sat, 16 Jan 2021 00:28:59 +0100
Subject: [PATCH 16/20] BlockMacros: {include} is not passing all local
 variables by default WIP [Closes #163] (BC break)

---
 src/Latte/Macros/BlockMacros.php              | 21 +++++--------------
 tests/Latte/BlockMacros.block6.phpt           |  2 +-
 tests/Latte/BlockMacros.local.phpt            |  4 ++--
 .../expected/BlockMacros.define.args1.phtml   |  2 +-
 tests/Latte/expected/BlockMacros.define.phtml |  4 ++--
 .../expected/BlockMacros.dynamicblock.phtml   |  2 +-
 .../expected/BlockMacros.local.dynamic.phtml  |  2 +-
 7 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
index f0fcc46fe..249917bca 100644
--- a/src/Latte/Macros/BlockMacros.php
+++ b/src/Latte/Macros/BlockMacros.php
@@ -40,9 +40,6 @@ class BlockMacros extends MacroSet
 	/** @var string[] */
 	private $imports;
 
-	/** @var array[] */
-	private $placeholders;
-
 
 	public static function install(Latte\Compiler $compiler): void
 	{
@@ -72,7 +69,6 @@ public function initialize()
 		$this->index = Template::LAYER_TOP;
 		$this->extends = null;
 		$this->imports = [];
-		$this->placeholders = [];
 	}
 
 
@@ -82,13 +78,6 @@ public function initialize()
 	public function finalize()
 	{
 		$compiler = $this->getCompiler();
-		foreach ($this->placeholders as $key => [$index, $blockName]) {
-			$block = $this->blocks[$index][$blockName] ?? $this->blocks[Template::LAYER_LOCAL][$blockName] ?? null;
-			$compiler->placeholders[$key] = $block && !$block->hasParameters
-				? 'get_defined_vars()'
-				: '[]';
-		}
-
 		$meta = [];
 		foreach ($this->blocks as $layer => $blocks) {
 			foreach ($blocks as $name => $block) {
@@ -160,7 +149,7 @@ public function macroInclude(MacroNode $node, PhpWriter $writer)
 			);
 		}
 
-		$parent = $name === 'parent';
+		$orig = $name;
 		if ($name === 'parent' || $name === 'this') {
 			$item = $node->closest(['block', 'define'], function ($node) { return $node->data->name !== ''; });
 			if (!$item) {
@@ -170,18 +159,18 @@ public function macroInclude(MacroNode $node, PhpWriter $writer)
 		}
 
 		$key = uniqid() . '$iterator'; // to fool CoreMacros::macroEndForeach
-		$this->placeholders[$key] = [$this->index, $name];
 		$phpName = $this->isDynamic($name)
 			? $writer->formatWord($name)
 			: PhpHelpers::dump($name);
 
 		return $writer->write(
-			'$this->renderBlock' . ($parent ? 'Parent' : '')
+			'$this->renderBlock' . ($orig === 'parent' ? 'Parent' : '')
 			. '(' . $phpName . ', '
-			. '%node.array? + ' . $key
+			. '%node.array? + '
+			. ($orig === 'parent' || $orig === 'this' ? 'get_defined_vars()' : '[]')
 			. ($node->modifiers
 				? ', function ($s, $type) { $ʟ_fi = new LR\FilterInfo($type); return %modifyContent($s); }'
-				: ($noEscape || $parent ? '' : ', ' . PhpHelpers::dump(implode($node->context))))
+				: ($noEscape || $orig === 'parent' ? '' : ', ' . PhpHelpers::dump(implode($node->context))))
 			. ') %node.line;'
 		);
 	}
diff --git a/tests/Latte/BlockMacros.block6.phpt b/tests/Latte/BlockMacros.block6.phpt
index 114a2214a..5d08a7b8d 100644
--- a/tests/Latte/BlockMacros.block6.phpt
+++ b/tests/Latte/BlockMacros.block6.phpt
@@ -26,7 +26,7 @@ Assert::match(
 		'
 {define a}
 	{var $x = "X"}
-	{include #b}
+	{include #b (expand) get_defined_vars()}
 {/define}
 
 {define b}
diff --git a/tests/Latte/BlockMacros.local.phpt b/tests/Latte/BlockMacros.local.phpt
index e26d0d874..c4041cc1e 100644
--- a/tests/Latte/BlockMacros.local.phpt
+++ b/tests/Latte/BlockMacros.local.phpt
@@ -57,7 +57,7 @@ Assert::same(
 	'5',
 	trim($latte->renderToString('
 		{var $i = 5}
-		{include abc}
+		{include abc (expand) get_defined_vars()}
 		{define local abc}{$i}{/define}
 	'))
 );
@@ -68,7 +68,7 @@ Assert::same(
 	trim($latte->renderToString('
 		{define local abc}{$i}{/define}
 		{var $i = 5}
-		{include abc}
+		{include abc (expand) get_defined_vars()}
 	'))
 );
 
diff --git a/tests/Latte/expected/BlockMacros.define.args1.phtml b/tests/Latte/expected/BlockMacros.define.args1.phtml
index d1d804ce6..d33e391b9 100644
--- a/tests/Latte/expected/BlockMacros.define.args1.phtml
+++ b/tests/Latte/expected/BlockMacros.define.args1.phtml
@@ -20,7 +20,7 @@ a) ';
 
 
 b) ';
-		$this->renderBlock('outer', get_defined_vars(), 'html') /* line %d% */;
+		$this->renderBlock('outer', [], 'html') /* line %d% */;
 		echo '
 
 ';
diff --git a/tests/Latte/expected/BlockMacros.define.phtml b/tests/Latte/expected/BlockMacros.define.phtml
index 2c5ae4a2c..375efb846 100644
--- a/tests/Latte/expected/BlockMacros.define.phtml
+++ b/tests/Latte/expected/BlockMacros.define.phtml
@@ -16,9 +16,9 @@ final class Template%a% extends Latte\Runtime\Template
 			return get_defined_vars();
 		}
 		echo "\n";
-		$this->renderBlock('test', ['var' => 20] + get_defined_vars(), 'html') /* line %d% */;
+		$this->renderBlock('test', ['var' => 20] + [], 'html') /* line %d% */;
 		echo "\n";
-		$this->renderBlock('true', get_defined_vars(), 'html') /* line %d% */;
+		$this->renderBlock('true', [], 'html') /* line %d% */;
 		return get_defined_vars();
 	}
 
diff --git a/tests/Latte/expected/BlockMacros.dynamicblock.phtml b/tests/Latte/expected/BlockMacros.dynamicblock.phtml
index e3b373c1a..080fef85c 100644
--- a/tests/Latte/expected/BlockMacros.dynamicblock.phtml
+++ b/tests/Latte/expected/BlockMacros.dynamicblock.phtml
@@ -31,7 +31,7 @@ final class Template%a% extends Latte\Runtime\Template
 		echo "\n";
 		$this->renderBlock('dynamic', ['var' => 20] + [], 'html') /* line %d% */;
 		echo "\n";
-		$this->renderBlock('static', ['var' => 30] + get_defined_vars(), 'html') /* line %d% */;
+		$this->renderBlock('static', ['var' => 30] + [], 'html') /* line %d% */;
 		echo "\n";
 		$this->renderBlock(($name . ''), ['var' => 40] + [], 'html') /* line %d% */;
 		echo "\n";
diff --git a/tests/Latte/expected/BlockMacros.local.dynamic.phtml b/tests/Latte/expected/BlockMacros.local.dynamic.phtml
index c24a5da90..d7048d3ba 100644
--- a/tests/Latte/expected/BlockMacros.local.dynamic.phtml
+++ b/tests/Latte/expected/BlockMacros.local.dynamic.phtml
@@ -31,7 +31,7 @@ final class Template%a% extends Latte\Runtime\Template
 		echo "\n";
 		$this->renderBlock('dynamic', ['var' => 20] + [], 'html') /* line %d% */;
 		echo "\n";
-		$this->renderBlock('static', ['var' => 30] + get_defined_vars(), 'html') /* line %d% */;
+		$this->renderBlock('static', ['var' => 30] + [], 'html') /* line %d% */;
 		echo "\n";
 		$this->renderBlock(($name . ''), ['var' => 40] + [], 'html') /* line %d% */;
 		echo "\n";

From 1031a052a92ceff5148ff1e12640664d0f3011c1 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 23 Nov 2020 00:07:51 +0100
Subject: [PATCH 17/20] compiler-related classes moved to namespace
 Latte\Compiler (BC break)

---
 src/Latte/Compiler/Compiler.php                  |  9 ++++++++-
 src/Latte/Compiler/HtmlNode.php                  |  4 +++-
 src/Latte/{ => Compiler}/Macro.php               |  2 +-
 src/Latte/Compiler/MacroNode.php                 |  5 ++++-
 src/Latte/Compiler/MacroTokens.php               |  2 +-
 src/Latte/Compiler/Parser.php                    |  8 +++++++-
 src/Latte/Compiler/PhpHelpers.php                |  2 +-
 src/Latte/Compiler/PhpWriter.php                 | 11 ++++++++---
 src/Latte/Compiler/Token.php                     |  4 +++-
 src/Latte/Compiler/TokenIterator.php             |  5 ++++-
 src/Latte/Compiler/Tokenizer.php                 |  6 +++++-
 src/Latte/Engine.php                             |  4 ++++
 src/Latte/Macros/BlockMacros.php                 | 12 ++++++------
 src/Latte/Macros/CoreMacros.php                  | 16 ++++++++--------
 src/Latte/Macros/MacroSet.php                    | 16 ++++++++--------
 src/Latte/Runtime/Filters.php                    |  2 +-
 tests/Latte/BlockMacros.ifset.block.phpt         |  2 +-
 tests/Latte/Compiler.emptyMacros.phpt            |  6 +++---
 tests/Latte/Compiler.flag.ALLOWED_IN_HEAD.phpt   |  4 ++--
 tests/Latte/Compiler.flag.AUTO_CLOSE.phpt        |  4 ++--
 tests/Latte/Compiler.flag.AUTO_EMPTY.phpt        |  4 ++--
 tests/Latte/Compiler.htmlNode.empty.phpt         |  4 ++--
 tests/Latte/Compiler.htmlNode.lines.phpt         |  8 ++++----
 tests/Latte/Compiler.htmlNode.phpt               |  8 ++++----
 tests/Latte/Compiler.macro.empty.phpt            |  4 ++--
 tests/Latte/Compiler.macro.lines.phpt            |  4 ++--
 ...Compiler.macro.methodsCallingOrder.empty.phpt |  8 ++++----
 .../Compiler.macro.methodsCallingOrder.phpt      |  8 ++++----
 tests/Latte/Compiler.macro.non-empty.phpt        |  4 ++--
 .../Compiler.writeAttrsMacro.innerContent.phpt   |  4 ++--
 tests/Latte/Compiler.writeAttrsMacro.order.phpt  |  4 ++--
 tests/Latte/CoreMacros.foreach.phpt              |  2 +-
 tests/Latte/CoreMacros.if.phpt                   |  2 +-
 tests/Latte/CoreMacros.translate.phpt            |  2 +-
 tests/Latte/CoreMacros.try.errors.phpt           |  2 +-
 tests/Latte/CoreMacros.try.phpt                  |  2 +-
 tests/Latte/CoreMacros.var.default.phpt          |  2 +-
 tests/Latte/MacroSet.basic.phpt                  |  2 +-
 tests/Latte/MacroTokens.append().phpt            |  2 +-
 tests/Latte/MacroTokens.fetchWord().phpt         |  2 +-
 tests/Latte/MacroTokens.fetchWords().phpt        |  2 +-
 tests/Latte/MacroTokens.parse.phpt               |  2 +-
 tests/Latte/Parser.errors.phpt                   |  2 +-
 tests/Latte/Parser.expandMacro.reentrant.phpt    |  2 +-
 tests/Latte/Parser.parse.phpt                    |  4 ++--
 tests/Latte/Parser.parseMacroTag.phpt            |  2 +-
 tests/Latte/Parser.setContentType.phpt           |  4 ++--
 tests/Latte/PhpHelpers.dump().phpt               |  2 +-
 tests/Latte/PhpHelpers.inlineHtmlToEcho().phpt   |  2 +-
 tests/Latte/PhpHelpers.reformatCode().phpt       |  2 +-
 tests/Latte/PhpWriter.formatArgs().phpt          |  4 ++--
 tests/Latte/PhpWriter.formatArray().phpt         |  4 ++--
 tests/Latte/PhpWriter.formatModifiers().phpt     |  4 ++--
 tests/Latte/PhpWriter.formatWord().phpt          |  4 ++--
 tests/Latte/PhpWriter.namedArgumentsPass().phpt  |  4 ++--
 .../PhpWriter.optionalChainingPass().80.phpt     |  4 ++--
 ...Writer.optionalChainingPass().coalescing.phpt |  4 ++--
 .../Latte/PhpWriter.optionalChainingPass().phpt  |  4 ++--
 tests/Latte/TokenIterator.join.phpt              |  4 ++--
 tests/Latte/TokenIterator.traversing.phpt        |  4 ++--
 tests/Latte/Tokenizer.getCoordinates.phpt        |  2 +-
 tests/Latte/Tokenizer.namedTokens.phpt           |  2 +-
 62 files changed, 153 insertions(+), 117 deletions(-)
 rename src/Latte/{ => Compiler}/Macro.php (96%)

diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
index da202aeca..d964d9fbe 100644
--- a/src/Latte/Compiler/Compiler.php
+++ b/src/Latte/Compiler/Compiler.php
@@ -7,7 +7,14 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte\CompileException;
+use Latte\Engine;
+use Latte\Helpers;
+use Latte\Policy;
+use Latte\SecurityViolationException;
+use Latte\Strict;
 
 
 /**
diff --git a/src/Latte/Compiler/HtmlNode.php b/src/Latte/Compiler/HtmlNode.php
index 75668428f..0e2aed9b4 100644
--- a/src/Latte/Compiler/HtmlNode.php
+++ b/src/Latte/Compiler/HtmlNode.php
@@ -7,7 +7,9 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte\Strict;
 
 
 /**
diff --git a/src/Latte/Macro.php b/src/Latte/Compiler/Macro.php
similarity index 96%
rename from src/Latte/Macro.php
rename to src/Latte/Compiler/Macro.php
index d9b2562e2..84e5f3577 100644
--- a/src/Latte/Macro.php
+++ b/src/Latte/Compiler/Macro.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
 
 
 /**
diff --git a/src/Latte/Compiler/MacroNode.php b/src/Latte/Compiler/MacroNode.php
index bea5496bc..efc85bf32 100644
--- a/src/Latte/Compiler/MacroNode.php
+++ b/src/Latte/Compiler/MacroNode.php
@@ -7,7 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte\CompileException;
+use Latte\Strict;
 
 
 /**
diff --git a/src/Latte/Compiler/MacroTokens.php b/src/Latte/Compiler/MacroTokens.php
index 2ad25f906..d84882f7b 100644
--- a/src/Latte/Compiler/MacroTokens.php
+++ b/src/Latte/Compiler/MacroTokens.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
 
 
 /**
diff --git a/src/Latte/Compiler/Parser.php b/src/Latte/Compiler/Parser.php
index a57f1c9f6..40327e6f0 100644
--- a/src/Latte/Compiler/Parser.php
+++ b/src/Latte/Compiler/Parser.php
@@ -7,7 +7,13 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte\CompileException;
+use Latte\Engine;
+use Latte\Helpers;
+use Latte\RegexpException;
+use Latte\Strict;
 
 
 /**
diff --git a/src/Latte/Compiler/PhpHelpers.php b/src/Latte/Compiler/PhpHelpers.php
index 49af39a7d..4817b56ed 100644
--- a/src/Latte/Compiler/PhpHelpers.php
+++ b/src/Latte/Compiler/PhpHelpers.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
 
 
 /**
diff --git a/src/Latte/Compiler/PhpWriter.php b/src/Latte/Compiler/PhpWriter.php
index 5e49dba04..b70e70bac 100644
--- a/src/Latte/Compiler/PhpWriter.php
+++ b/src/Latte/Compiler/PhpWriter.php
@@ -7,7 +7,12 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte;
+use Latte\CompileException;
+use Latte\Policy;
+use Latte\SecurityViolationException;
 
 
 /**
@@ -15,7 +20,7 @@
  */
 class PhpWriter
 {
-	use Strict;
+	use Latte\Strict;
 
 	/** @var MacroTokens */
 	private $tokens;
@@ -223,7 +228,7 @@ public function validateTokens(MacroTokens $tokens): void
 				throw new CompileException('Backtick operator is forbidden in Latte.');
 
 			} elseif (
-				Helpers::startsWith($tokenValue, '$ʟ_')
+				Latte\Helpers::startsWith($tokenValue, '$ʟ_')
 				|| ($this->policy && $tokens->isCurrent('$this'))
 			) {
 				throw new CompileException("Forbidden variable {$tokenValue}.");
diff --git a/src/Latte/Compiler/Token.php b/src/Latte/Compiler/Token.php
index ec4a1b1d5..0ad240840 100644
--- a/src/Latte/Compiler/Token.php
+++ b/src/Latte/Compiler/Token.php
@@ -7,7 +7,9 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte\Strict;
 
 
 /**
diff --git a/src/Latte/Compiler/TokenIterator.php b/src/Latte/Compiler/TokenIterator.php
index a0a41a3d1..cec5cd59e 100644
--- a/src/Latte/Compiler/TokenIterator.php
+++ b/src/Latte/Compiler/TokenIterator.php
@@ -7,7 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte\CompileException;
+use Latte\Strict;
 
 
 /**
diff --git a/src/Latte/Compiler/Tokenizer.php b/src/Latte/Compiler/Tokenizer.php
index 6b05beb97..d8903a8e7 100644
--- a/src/Latte/Compiler/Tokenizer.php
+++ b/src/Latte/Compiler/Tokenizer.php
@@ -7,7 +7,11 @@
 
 declare(strict_types=1);
 
-namespace Latte;
+namespace Latte\Compiler;
+
+use Latte\CompileException;
+use Latte\RegexpException;
+use Latte\Strict;
 
 
 /**
diff --git a/src/Latte/Engine.php b/src/Latte/Engine.php
index e79f135d6..271fe0fb6 100644
--- a/src/Latte/Engine.php
+++ b/src/Latte/Engine.php
@@ -10,6 +10,10 @@
 namespace Latte;
 
 
+use Latte\Compiler\Compiler;
+use Latte\Compiler\Macro;
+use Latte\Compiler\Parser;
+
 /**
  * Templating engine Latte.
  */
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
index 249917bca..3c4ab59c3 100644
--- a/src/Latte/Macros/BlockMacros.php
+++ b/src/Latte/Macros/BlockMacros.php
@@ -11,10 +11,10 @@
 
 use Latte;
 use Latte\CompileException;
+use Latte\Compiler\MacroNode;
+use Latte\Compiler\PhpHelpers;
+use Latte\Compiler\PhpWriter;
 use Latte\Helpers;
-use Latte\MacroNode;
-use Latte\PhpHelpers;
-use Latte\PhpWriter;
 use Latte\Runtime\Block;
 use Latte\Runtime\SnippetDriver;
 use Latte\Runtime\Template;
@@ -41,7 +41,7 @@ class BlockMacros extends MacroSet
 	private $imports;
 
 
-	public static function install(Latte\Compiler $compiler): void
+	public static function install(Latte\Compiler\Compiler $compiler): void
 	{
 		$me = new static($compiler);
 		$me->addMacro('include', [$me, 'macroInclude']);
@@ -260,7 +260,7 @@ public function macroBlock(MacroNode $node, PhpWriter $writer)
 			return;
 		}
 
-		if (Helpers::startsWith((string) $node->context[1], Latte\Compiler::CONTEXT_HTML_ATTRIBUTE)) {
+		if (Helpers::startsWith((string) $node->context[1], Latte\Compiler\Compiler::CONTEXT_HTML_ATTRIBUTE)) {
 			$node->context[1] = '';
 			$node->modifiers .= '|escape';
 		} elseif ($node->modifiers) {
@@ -625,7 +625,7 @@ public function macroIfset(MacroNode $node, PhpWriter $writer)
 		while ([$name, $block] = $node->tokenizer->fetchWordWithModifier('block')) {
 			$list[] = $block || preg_match('~#|[\w-]+$~DA', $name)
 				? '$this->hasBlock(' . $writer->formatWord(ltrim($name, '#')) . ')'
-				: 'isset(' . $writer->formatArgs(new Latte\MacroTokens($name)) . ')';
+				: 'isset(' . $writer->formatArgs(new Latte\Compiler\MacroTokens($name)) . ')';
 		}
 		return $writer->write(($node->name === 'elseifset' ? '} else' : '') . 'if (%raw) %node.line {', implode(' && ', $list));
 	}
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
index 3a0abbf13..af324d047 100644
--- a/src/Latte/Macros/CoreMacros.php
+++ b/src/Latte/Macros/CoreMacros.php
@@ -11,11 +11,11 @@
 
 use Latte;
 use Latte\CompileException;
+use Latte\Compiler\MacroNode;
+use Latte\Compiler\PhpHelpers;
+use Latte\Compiler\PhpWriter;
 use Latte\Engine;
 use Latte\Helpers;
-use Latte\MacroNode;
-use Latte\PhpHelpers;
-use Latte\PhpWriter;
 
 
 /**
@@ -33,7 +33,7 @@ class CoreMacros extends MacroSet
 	private $idCounter = 0;
 
 
-	public static function install(Latte\Compiler $compiler): void
+	public static function install(Latte\Compiler\Compiler $compiler): void
 	{
 		$me = new static($compiler);
 
@@ -118,7 +118,7 @@ public function finalize()
 		$code = '';
 		if ($this->overwrittenVars) {
 			$vars = array_map(function ($l) { return implode(', ', $l); }, $this->overwrittenVars);
-			$code .= 'foreach (array_intersect_key(' . Latte\PhpHelpers::dump($vars) . ', $this->params) as $ʟ_v => $ʟ_l) { '
+			$code .= 'foreach (array_intersect_key(' . Latte\Compiler\PhpHelpers::dump($vars) . ', $this->params) as $ʟ_v => $ʟ_l) { '
 				. 'trigger_error("Variable \$$ʟ_v overwritten in foreach on line $ʟ_l"); } ';
 		}
 		$code = $code
@@ -606,12 +606,12 @@ public function macroTagEnd(MacroNode $node, PhpWriter $writer): void
 		?>', $node->htmlNode->data->id, $node->htmlNode->name);
 
 		$node->content = preg_replace(
-			'~^(\s*<)' . Latte\Parser::RE_TAG_NAME . '~',
+			'~^(\s*<)' . Latte\Compiler\Parser::RE_TAG_NAME . '~',
 			"\$1<?php echo \$ʟ_tag[{$node->htmlNode->data->id}]; ?>\n",
 			$node->content
 		);
 		$node->content = preg_replace(
-			'~</' . Latte\Parser::RE_TAG_NAME . '(\s*>\s*)$~',
+			'~</' . Latte\Compiler\Parser::RE_TAG_NAME . '(\s*>\s*)$~',
 			"</<?php echo \$ʟ_tag[{$node->htmlNode->data->id}]; ?>\n\$1",
 			$node->content
 		);
@@ -682,7 +682,7 @@ public function macroVar(MacroNode $node, PhpWriter $writer): string
 		$var = true;
 		$hasType = false;
 		$tokens = $node->tokenizer;
-		$res = new Latte\MacroTokens;
+		$res = new Latte\Compiler\MacroTokens;
 		while ($tokens->nextToken()) {
 			if (
 				$var
diff --git a/src/Latte/Macros/MacroSet.php b/src/Latte/Macros/MacroSet.php
index 7966cf677..8cfedd8ac 100644
--- a/src/Latte/Macros/MacroSet.php
+++ b/src/Latte/Macros/MacroSet.php
@@ -11,24 +11,24 @@
 
 use Latte;
 use Latte\CompileException;
-use Latte\MacroNode;
+use Latte\Compiler\MacroNode;
 
 
 /**
  * Base Macro implementation. Allows add multiple macros.
  */
-class MacroSet implements Latte\Macro
+class MacroSet implements Latte\Compiler\Macro
 {
 	use Latte\Strict;
 
-	/** @var Latte\Compiler */
+	/** @var \Latte\Compiler\Compiler */
 	private $compiler;
 
 	/** @var array<string, array{string|callable|null, string|callable|null, string|callable|null}> */
 	private $macros;
 
 
-	public function __construct(Latte\Compiler $compiler)
+	public function __construct(Latte\Compiler\Compiler $compiler)
 	{
 		$this->compiler = $compiler;
 	}
@@ -103,14 +103,14 @@ public function nodeOpened(MacroNode $node)
 
 		if ($attr && $node->prefix === $node::PREFIX_NONE) {
 			$node->empty = true;
-			$node->context[1] = Latte\Compiler::CONTEXT_HTML_ATTRIBUTE;
+			$node->context[1] = Latte\Compiler\Compiler::CONTEXT_HTML_ATTRIBUTE;
 			$res = $this->compile($node, $attr);
 			if ($res === false) {
 				return false;
 			} elseif (!$node->attrCode) {
 				$node->attrCode = "<?php $res ?>";
 			}
-			$node->context[1] = Latte\Compiler::CONTEXT_HTML_TEXT;
+			$node->context[1] = Latte\Compiler\Compiler::CONTEXT_HTML_TEXT;
 
 		} elseif ($node->empty && $node->prefix) {
 			return false;
@@ -153,14 +153,14 @@ public function nodeClosed(MacroNode $node)
 	private function compile(MacroNode $node, $def)
 	{
 		$node->tokenizer->reset();
-		$writer = Latte\PhpWriter::using($node, $this->compiler);
+		$writer = Latte\Compiler\PhpWriter::using($node, $this->compiler);
 		return is_string($def)
 			? $writer->write($def)
 			: $def($node, $writer);
 	}
 
 
-	public function getCompiler(): Latte\Compiler
+	public function getCompiler(): Latte\Compiler\Compiler
 	{
 		return $this->compiler;
 	}
diff --git a/src/Latte/Runtime/Filters.php b/src/Latte/Runtime/Filters.php
index 9eb4ae5c2..53627684a 100644
--- a/src/Latte/Runtime/Filters.php
+++ b/src/Latte/Runtime/Filters.php
@@ -893,7 +893,7 @@ public static function checkTagSwitch(string $orig, $new): void
 	{
 		if (
 			!is_string($new)
-			|| !preg_match('~' . Latte\Parser::RE_TAG_NAME . '$~DA', $new)
+			|| !preg_match('~' . Latte\Compiler\Parser::RE_TAG_NAME . '$~DA', $new)
 		) {
 			throw new Latte\RuntimeException('Invalid tag name ' . var_export($new, true));
 		}
diff --git a/tests/Latte/BlockMacros.ifset.block.phpt b/tests/Latte/BlockMacros.ifset.block.phpt
index 282b409fa..705a3062e 100644
--- a/tests/Latte/BlockMacros.ifset.block.phpt
+++ b/tests/Latte/BlockMacros.ifset.block.phpt
@@ -13,7 +13,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 BlockMacros::install($compiler);
 
 // {ifset ... }
diff --git a/tests/Latte/Compiler.emptyMacros.phpt b/tests/Latte/Compiler.emptyMacros.phpt
index 73d31ef0d..87731ce69 100644
--- a/tests/Latte/Compiler.emptyMacros.phpt
+++ b/tests/Latte/Compiler.emptyMacros.phpt
@@ -6,12 +6,12 @@
 
 declare(strict_types=1);
 
-use Latte\Compiler;
+use Latte\Compiler\Compiler;
+use Latte\Compiler\MacroNode;
+use Latte\Compiler\PhpWriter;
 use Latte\Engine;
 use Latte\Loaders\StringLoader;
-use Latte\MacroNode;
 use Latte\Macros\MacroSet;
-use Latte\PhpWriter;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/Latte/Compiler.flag.ALLOWED_IN_HEAD.phpt b/tests/Latte/Compiler.flag.ALLOWED_IN_HEAD.phpt
index 2ac9fa985..fe6f114b4 100644
--- a/tests/Latte/Compiler.flag.ALLOWED_IN_HEAD.phpt
+++ b/tests/Latte/Compiler.flag.ALLOWED_IN_HEAD.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/Latte/Compiler.flag.AUTO_CLOSE.phpt b/tests/Latte/Compiler.flag.AUTO_CLOSE.phpt
index d612eb171..7209433f3 100644
--- a/tests/Latte/Compiler.flag.AUTO_CLOSE.phpt
+++ b/tests/Latte/Compiler.flag.AUTO_CLOSE.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt b/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt
index 6bd515f2c..815635550 100644
--- a/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt
+++ b/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/Latte/Compiler.htmlNode.empty.phpt b/tests/Latte/Compiler.htmlNode.empty.phpt
index c288eb841..7a3ae9546 100644
--- a/tests/Latte/Compiler.htmlNode.empty.phpt
+++ b/tests/Latte/Compiler.htmlNode.empty.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.htmlNode.lines.phpt b/tests/Latte/Compiler.htmlNode.lines.phpt
index 857578080..98d26a6cd 100644
--- a/tests/Latte/Compiler.htmlNode.lines.phpt
+++ b/tests/Latte/Compiler.htmlNode.lines.phpt
@@ -6,10 +6,10 @@
 
 declare(strict_types=1);
 
-use Latte\Compiler;
-use Latte\Macro;
-use Latte\MacroNode;
-use Latte\Parser;
+use Latte\Compiler\Compiler;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
+use Latte\Compiler\Parser;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.htmlNode.phpt b/tests/Latte/Compiler.htmlNode.phpt
index a25c22772..286c7413c 100644
--- a/tests/Latte/Compiler.htmlNode.phpt
+++ b/tests/Latte/Compiler.htmlNode.phpt
@@ -6,10 +6,10 @@
 
 declare(strict_types=1);
 
-use Latte\Compiler;
-use Latte\Macro;
-use Latte\MacroNode;
-use Latte\Parser;
+use Latte\Compiler\Compiler;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
+use Latte\Compiler\Parser;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.macro.empty.phpt b/tests/Latte/Compiler.macro.empty.phpt
index ba09b1b10..bbb99bd6b 100644
--- a/tests/Latte/Compiler.macro.empty.phpt
+++ b/tests/Latte/Compiler.macro.empty.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.macro.lines.phpt b/tests/Latte/Compiler.macro.lines.phpt
index 055103d6f..6bd439373 100644
--- a/tests/Latte/Compiler.macro.lines.phpt
+++ b/tests/Latte/Compiler.macro.lines.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.macro.methodsCallingOrder.empty.phpt b/tests/Latte/Compiler.macro.methodsCallingOrder.empty.phpt
index 2017bd55b..e5e8342e6 100644
--- a/tests/Latte/Compiler.macro.methodsCallingOrder.empty.phpt
+++ b/tests/Latte/Compiler.macro.methodsCallingOrder.empty.phpt
@@ -6,10 +6,10 @@
 
 declare(strict_types=1);
 
-use Latte\Compiler;
-use Latte\Macro;
-use Latte\MacroNode;
-use Latte\Parser;
+use Latte\Compiler\Compiler;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
+use Latte\Compiler\Parser;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.macro.methodsCallingOrder.phpt b/tests/Latte/Compiler.macro.methodsCallingOrder.phpt
index a561dc24f..6a73aacbc 100644
--- a/tests/Latte/Compiler.macro.methodsCallingOrder.phpt
+++ b/tests/Latte/Compiler.macro.methodsCallingOrder.phpt
@@ -6,10 +6,10 @@
 
 declare(strict_types=1);
 
-use Latte\Compiler;
-use Latte\Macro;
-use Latte\MacroNode;
-use Latte\Parser;
+use Latte\Compiler\Compiler;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
+use Latte\Compiler\Parser;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.macro.non-empty.phpt b/tests/Latte/Compiler.macro.non-empty.phpt
index ca4b3cf24..b5b3c808e 100644
--- a/tests/Latte/Compiler.macro.non-empty.phpt
+++ b/tests/Latte/Compiler.macro.non-empty.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.writeAttrsMacro.innerContent.phpt b/tests/Latte/Compiler.writeAttrsMacro.innerContent.phpt
index 7679f95bd..e1e5a1b4f 100644
--- a/tests/Latte/Compiler.writeAttrsMacro.innerContent.phpt
+++ b/tests/Latte/Compiler.writeAttrsMacro.innerContent.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Compiler.writeAttrsMacro.order.phpt b/tests/Latte/Compiler.writeAttrsMacro.order.phpt
index c3af241f5..293c4e429 100644
--- a/tests/Latte/Compiler.writeAttrsMacro.order.phpt
+++ b/tests/Latte/Compiler.writeAttrsMacro.order.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\Macro;
-use Latte\MacroNode;
+use Latte\Compiler\Macro;
+use Latte\Compiler\MacroNode;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/CoreMacros.foreach.phpt b/tests/Latte/CoreMacros.foreach.phpt
index b80016486..57a78b14f 100644
--- a/tests/Latte/CoreMacros.foreach.phpt
+++ b/tests/Latte/CoreMacros.foreach.phpt
@@ -13,7 +13,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 CoreMacros::install($compiler);
 
 $prefix = '<?php $iterations = 0; '
diff --git a/tests/Latte/CoreMacros.if.phpt b/tests/Latte/CoreMacros.if.phpt
index 9a95e8a72..9d256f9ca 100644
--- a/tests/Latte/CoreMacros.if.phpt
+++ b/tests/Latte/CoreMacros.if.phpt
@@ -13,7 +13,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 CoreMacros::install($compiler);
 
 Assert::same('<?php if (isset($var)) { ?>', $compiler->expandMacro('ifset', '$var')->openingCode);
diff --git a/tests/Latte/CoreMacros.translate.phpt b/tests/Latte/CoreMacros.translate.phpt
index 35ec2e345..9ddfac4b4 100644
--- a/tests/Latte/CoreMacros.translate.phpt
+++ b/tests/Latte/CoreMacros.translate.phpt
@@ -13,7 +13,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 CoreMacros::install($compiler);
 
 // {_...}
diff --git a/tests/Latte/CoreMacros.try.errors.phpt b/tests/Latte/CoreMacros.try.errors.phpt
index dcb778cb1..f482c745f 100644
--- a/tests/Latte/CoreMacros.try.errors.phpt
+++ b/tests/Latte/CoreMacros.try.errors.phpt
@@ -13,7 +13,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 CoreMacros::install($compiler);
 
 Assert::exception(function () use ($compiler) {
diff --git a/tests/Latte/CoreMacros.try.phpt b/tests/Latte/CoreMacros.try.phpt
index 5ebca9277..1affee637 100644
--- a/tests/Latte/CoreMacros.try.phpt
+++ b/tests/Latte/CoreMacros.try.phpt
@@ -13,7 +13,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 CoreMacros::install($compiler);
 
 
diff --git a/tests/Latte/CoreMacros.var.default.phpt b/tests/Latte/CoreMacros.var.default.phpt
index 3cbb75645..0548d749d 100644
--- a/tests/Latte/CoreMacros.var.default.phpt
+++ b/tests/Latte/CoreMacros.var.default.phpt
@@ -13,7 +13,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 CoreMacros::install($compiler);
 
 test('', function () use ($compiler) { // {var ... }
diff --git a/tests/Latte/MacroSet.basic.phpt b/tests/Latte/MacroSet.basic.phpt
index 5f5f99be6..769bf8fb2 100644
--- a/tests/Latte/MacroSet.basic.phpt
+++ b/tests/Latte/MacroSet.basic.phpt
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Latte\MacroNode;
+use Latte\Compiler\MacroNode;
 use Latte\Macros\MacroSet;
 use Tester\Assert;
 
diff --git a/tests/Latte/MacroTokens.append().phpt b/tests/Latte/MacroTokens.append().phpt
index 22265ce24..2528a9dfa 100644
--- a/tests/Latte/MacroTokens.append().phpt
+++ b/tests/Latte/MacroTokens.append().phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
+use Latte\Compiler\MacroTokens;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/MacroTokens.fetchWord().phpt b/tests/Latte/MacroTokens.fetchWord().phpt
index 924cd3561..6a7167605 100644
--- a/tests/Latte/MacroTokens.fetchWord().phpt
+++ b/tests/Latte/MacroTokens.fetchWord().phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
+use Latte\Compiler\MacroTokens;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/MacroTokens.fetchWords().phpt b/tests/Latte/MacroTokens.fetchWords().phpt
index a90817b2f..48423ffa9 100644
--- a/tests/Latte/MacroTokens.fetchWords().phpt
+++ b/tests/Latte/MacroTokens.fetchWords().phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
+use Latte\Compiler\MacroTokens;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/MacroTokens.parse.phpt b/tests/Latte/MacroTokens.parse.phpt
index 3d2fcb208..e9870bad8 100644
--- a/tests/Latte/MacroTokens.parse.phpt
+++ b/tests/Latte/MacroTokens.parse.phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
+use Latte\Compiler\MacroTokens;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Parser.errors.phpt b/tests/Latte/Parser.errors.phpt
index 5b87b1f15..c665b39e8 100644
--- a/tests/Latte/Parser.errors.phpt
+++ b/tests/Latte/Parser.errors.phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\Parser;
+use Latte\Compiler\Parser;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Parser.expandMacro.reentrant.phpt b/tests/Latte/Parser.expandMacro.reentrant.phpt
index 253910a46..b9e4c71b8 100644
--- a/tests/Latte/Parser.expandMacro.reentrant.phpt
+++ b/tests/Latte/Parser.expandMacro.reentrant.phpt
@@ -12,7 +12,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$compiler = new Latte\Compiler;
+$compiler = new \Latte\Compiler\Compiler;
 $set = new Latte\Macros\MacroSet($compiler);
 $set->addMacro('test', 'echo %node.word', 'echo %node.word');
 
diff --git a/tests/Latte/Parser.parse.phpt b/tests/Latte/Parser.parse.phpt
index 89780a545..f18909432 100644
--- a/tests/Latte/Parser.parse.phpt
+++ b/tests/Latte/Parser.parse.phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\Token;
+use Latte\Compiler\Token;
 use Tester\Assert;
 
 
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 
 function parse($s)
 {
-	$parser = new Latte\Parser;
+	$parser = new \Latte\Compiler\Parser;
 	return array_map(function (Token $token) {
 		return array_filter([$token->type, $token->text, $token->name, $token->value]);
 	}, $parser->parse($s));
diff --git a/tests/Latte/Parser.parseMacroTag.phpt b/tests/Latte/Parser.parseMacroTag.phpt
index b9efdd970..b6596055e 100644
--- a/tests/Latte/Parser.parseMacroTag.phpt
+++ b/tests/Latte/Parser.parseMacroTag.phpt
@@ -12,7 +12,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$parser = new Latte\Parser;
+$parser = new \Latte\Compiler\Parser;
 
 
 Assert::same(['?', 'echo', '', false, false], $parser->parseMacroTag('? echo'));
diff --git a/tests/Latte/Parser.setContentType.phpt b/tests/Latte/Parser.setContentType.phpt
index 13b0510c4..29a00feec 100644
--- a/tests/Latte/Parser.setContentType.phpt
+++ b/tests/Latte/Parser.setContentType.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
+use Latte\Compiler\Token;
 use Latte\Engine;
-use Latte\Token;
 use Tester\Assert;
 
 
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 function parse($s, $contentType = null)
 {
-	$parser = new Latte\Parser;
+	$parser = new \Latte\Compiler\Parser;
 	$parser->setContentType($contentType ?: Engine::CONTENT_HTML);
 	return array_map(function (Token $token) {
 		return [$token->type, $token->text];
diff --git a/tests/Latte/PhpHelpers.dump().phpt b/tests/Latte/PhpHelpers.dump().phpt
index 8924e9199..a972fb776 100644
--- a/tests/Latte/PhpHelpers.dump().phpt
+++ b/tests/Latte/PhpHelpers.dump().phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\PhpHelpers;
+use Latte\Compiler\PhpHelpers;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpHelpers.inlineHtmlToEcho().phpt b/tests/Latte/PhpHelpers.inlineHtmlToEcho().phpt
index a42c7c041..ca66f30ba 100644
--- a/tests/Latte/PhpHelpers.inlineHtmlToEcho().phpt
+++ b/tests/Latte/PhpHelpers.inlineHtmlToEcho().phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\PhpHelpers;
+use Latte\Compiler\PhpHelpers;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpHelpers.reformatCode().phpt b/tests/Latte/PhpHelpers.reformatCode().phpt
index ce4a9c53e..5c41573b9 100644
--- a/tests/Latte/PhpHelpers.reformatCode().phpt
+++ b/tests/Latte/PhpHelpers.reformatCode().phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\PhpHelpers;
+use Latte\Compiler\PhpHelpers;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt
index 0796d79e5..76bbec071 100644
--- a/tests/Latte/PhpWriter.formatArgs().phpt
+++ b/tests/Latte/PhpWriter.formatArgs().phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.formatArray().phpt b/tests/Latte/PhpWriter.formatArray().phpt
index c82cd849c..f1959ed05 100644
--- a/tests/Latte/PhpWriter.formatArray().phpt
+++ b/tests/Latte/PhpWriter.formatArray().phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.formatModifiers().phpt b/tests/Latte/PhpWriter.formatModifiers().phpt
index 4550f5c60..b77277102 100644
--- a/tests/Latte/PhpWriter.formatModifiers().phpt
+++ b/tests/Latte/PhpWriter.formatModifiers().phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.formatWord().phpt b/tests/Latte/PhpWriter.formatWord().phpt
index c047564d1..7ece6dc15 100644
--- a/tests/Latte/PhpWriter.formatWord().phpt
+++ b/tests/Latte/PhpWriter.formatWord().phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.namedArgumentsPass().phpt b/tests/Latte/PhpWriter.namedArgumentsPass().phpt
index 6b7aea811..dc15e01c6 100644
--- a/tests/Latte/PhpWriter.namedArgumentsPass().phpt
+++ b/tests/Latte/PhpWriter.namedArgumentsPass().phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.optionalChainingPass().80.phpt b/tests/Latte/PhpWriter.optionalChainingPass().80.phpt
index caaaed1c2..e08e3bda8 100644
--- a/tests/Latte/PhpWriter.optionalChainingPass().80.phpt
+++ b/tests/Latte/PhpWriter.optionalChainingPass().80.phpt
@@ -4,8 +4,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.optionalChainingPass().coalescing.phpt b/tests/Latte/PhpWriter.optionalChainingPass().coalescing.phpt
index 10fcad484..4990f3ac8 100644
--- a/tests/Latte/PhpWriter.optionalChainingPass().coalescing.phpt
+++ b/tests/Latte/PhpWriter.optionalChainingPass().coalescing.phpt
@@ -2,8 +2,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/PhpWriter.optionalChainingPass().phpt b/tests/Latte/PhpWriter.optionalChainingPass().phpt
index 57c6a72b4..48fec7c13 100644
--- a/tests/Latte/PhpWriter.optionalChainingPass().phpt
+++ b/tests/Latte/PhpWriter.optionalChainingPass().phpt
@@ -4,8 +4,8 @@
 
 declare(strict_types=1);
 
-use Latte\MacroTokens;
-use Latte\PhpWriter;
+use Latte\Compiler\MacroTokens;
+use Latte\Compiler\PhpWriter;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/TokenIterator.join.phpt b/tests/Latte/TokenIterator.join.phpt
index 497b35bd9..14e1a6d38 100644
--- a/tests/Latte/TokenIterator.join.phpt
+++ b/tests/Latte/TokenIterator.join.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Latte\TokenIterator;
-use Latte\Tokenizer;
+use Latte\Compiler\TokenIterator;
+use Latte\Compiler\Tokenizer;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/TokenIterator.traversing.phpt b/tests/Latte/TokenIterator.traversing.phpt
index a3cefe11c..ddbaffb90 100644
--- a/tests/Latte/TokenIterator.traversing.phpt
+++ b/tests/Latte/TokenIterator.traversing.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Latte\TokenIterator;
-use Latte\Tokenizer;
+use Latte\Compiler\TokenIterator;
+use Latte\Compiler\Tokenizer;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Tokenizer.getCoordinates.phpt b/tests/Latte/Tokenizer.getCoordinates.phpt
index 2e9ff0918..36290a0cb 100644
--- a/tests/Latte/Tokenizer.getCoordinates.phpt
+++ b/tests/Latte/Tokenizer.getCoordinates.phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\Tokenizer;
+use Latte\Compiler\Tokenizer;
 use Tester\Assert;
 
 
diff --git a/tests/Latte/Tokenizer.namedTokens.phpt b/tests/Latte/Tokenizer.namedTokens.phpt
index 2a2e5217e..1fb766473 100644
--- a/tests/Latte/Tokenizer.namedTokens.phpt
+++ b/tests/Latte/Tokenizer.namedTokens.phpt
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-use Latte\Tokenizer;
+use Latte\Compiler\Tokenizer;
 use Tester\Assert;
 
 

From 63998bddbf9cabd4b47e59d7af63c49883c72910 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Mon, 23 Nov 2020 00:40:51 +0100
Subject: [PATCH 18/20] RootNode

---
 src/Latte/Compiler/Compiler.php  | 17 +++++++++--------
 src/Latte/Compiler/MacroNode.php | 23 +++++++++++++++++------
 src/Latte/Compiler/Node.php      | 16 ++++++++++++++++
 src/Latte/Compiler/RootNode.php  | 18 ++++++++++++++++++
 src/Latte/Macros/BlockMacros.php |  8 ++++----
 src/Latte/Macros/CoreMacros.php  | 20 ++++++++++++--------
 6 files changed, 76 insertions(+), 26 deletions(-)
 create mode 100644 src/Latte/Compiler/Node.php
 create mode 100644 src/Latte/Compiler/RootNode.php

diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
index d964d9fbe..889acb3e6 100644
--- a/src/Latte/Compiler/Compiler.php
+++ b/src/Latte/Compiler/Compiler.php
@@ -81,7 +81,7 @@ class Compiler
 	/** @var HtmlNode|null */
 	private $htmlNode;
 
-	/** @var MacroNode|null */
+	/** @var Node|null */
 	private $macroNode;
 
 	/** @var string */
@@ -173,7 +173,8 @@ private function buildClassBody(array $tokens): string
 		$output = '';
 		$this->output = &$output;
 		$this->inHead = true;
-		$this->htmlNode = $this->macroNode = $this->context = $this->paramsExtraction = null;
+		$this->macroNode = new RootNode;
+		$this->htmlNode = $this->context = $this->paramsExtraction = null;
 		$this->placeholders = $this->properties = $this->constants = [];
 		$this->methods = ['main' => null, 'prepare' => null];
 
@@ -205,8 +206,8 @@ private function buildClassBody(array $tokens): string
 			$this->htmlNode = $this->htmlNode->parentNode;
 		}
 
-		while ($this->macroNode) {
-			if ($this->macroNode->parentNode) {
+		while (!$this->macroNode instanceof RootNode) {
+			if ($this->macroNode->parentNode instanceof MacroNode) {
 				throw new CompileException('Missing {/' . $this->macroNode->name . '}');
 			}
 			if (~$this->flags[$this->macroNode->name] & Macro::AUTO_CLOSE) {
@@ -280,7 +281,7 @@ public function getContentType(): string
 	}
 
 
-	public function getMacroNode(): ?MacroNode
+	public function getMacroNode(): Node
 	{
 		return $this->macroNode;
 	}
@@ -540,7 +541,7 @@ private function processHtmlAttributeBegin(Token $token): void
 			if (isset($this->htmlNode->macroAttrs[$name])) {
 				throw new CompileException("Found multiple attributes {$token->name}.");
 
-			} elseif ($this->macroNode && $this->macroNode->htmlNode === $this->htmlNode) {
+			} elseif ($this->macroNode instanceof MacroNode && $this->macroNode->htmlNode === $this->htmlNode) {
 				throw new CompileException("n:attribute must not appear inside tags; found {$token->name} inside {{$this->macroNode->name}}.");
 			}
 			$this->htmlNode->macroAttrs[$name] = $token->value;
@@ -648,7 +649,7 @@ public function closeMacro(
 		$node = $this->macroNode;
 
 		if (
-			!$node
+			!($node instanceof MacroNode)
 			|| ($node->name !== $name && $name !== '')
 			|| $modifiers
 			|| ($args !== '' && $node->args !== '' && !Helpers::startsWith($node->args . ' ', $args . ' '))
@@ -657,7 +658,7 @@ public function closeMacro(
 			$name = $nPrefix
 				? "</{$this->htmlNode->name}> for " . Parser::N_PREFIX . implode(' and ' . Parser::N_PREFIX, array_keys($this->htmlNode->macroAttrs))
 				: '{/' . $name . ($args ? ' ' . $args : '') . $modifiers . '}';
-			throw new CompileException("Unexpected $name" . ($node ? ', expecting ' . self::printEndTag($node->prefix ? $this->htmlNode : $node) : ''));
+			throw new CompileException("Unexpected $name" . ($node instanceof MacroNode ? ', expecting ' . self::printEndTag($node->prefix ? $this->htmlNode : $node) : ''));
 		}
 
 		if ($name === '') {
diff --git a/src/Latte/Compiler/MacroNode.php b/src/Latte/Compiler/MacroNode.php
index efc85bf32..eec65c4d5 100644
--- a/src/Latte/Compiler/MacroNode.php
+++ b/src/Latte/Compiler/MacroNode.php
@@ -16,7 +16,7 @@
 /**
  * Macro element node.
  */
-class MacroNode
+class MacroNode implements Node
 {
 	use Strict;
 
@@ -37,6 +37,9 @@ class MacroNode
 	/** @var string  raw arguments */
 	public $args;
 
+	/** @var Node[] */
+	public $children = [];
+
 	/** @var string  raw modifier */
 	public $modifiers;
 
@@ -49,7 +52,7 @@ class MacroNode
 	/** @var MacroTokens */
 	public $tokenizer;
 
-	/** @var MacroNode|null */
+	/** @var Node|null */
 	public $parentNode;
 
 	/** @var string */
@@ -94,7 +97,7 @@ public function __construct(
 		string $name,
 		string $args = '',
 		string $modifiers = '',
-		self $parentNode = null,
+		Node $parentNode = null,
 		HtmlNode $htmlNode = null,
 		string $prefix = null
 	) {
@@ -109,6 +112,14 @@ public function __construct(
 	}
 
 
+	public function getParentMacroNode(): ?self
+	{
+		return $this->parentNode instanceof self
+			? $this->parentNode
+			: null;
+	}
+
+
 	public function setArgs(string $args): void
 	{
 		$this->args = $args;
@@ -129,12 +140,12 @@ public function getNotation(): string
 	 */
 	public function closest(array $names, callable $condition = null): ?self
 	{
-		$node = $this->parentNode;
+		$node = $this->getParentMacroNode();
 		while ($node && (
 			!in_array($node->name, $names, true)
 			|| ($condition && !$condition($node))
 		)) {
-			$node = $node->parentNode;
+			$node = $node->getParentMacroNode();
 		}
 		return $node;
 	}
@@ -147,7 +158,7 @@ public function closest(array $names, callable $condition = null): ?self
 	 */
 	public function validate($arguments, array $parents = [], bool $modifiers = false): void
 	{
-		if ($parents && (!$this->parentNode || !in_array($this->parentNode->name, $parents, true))) {
+		if ($parents && (!$this->getParentMacroNode() || !in_array($this->parentNode->name, $parents, true))) {
 			throw new CompileException('Tag ' . $this->getNotation() . ' is unexpected here.');
 
 		} elseif ($this->modifiers !== '' && !$modifiers) {
diff --git a/src/Latte/Compiler/Node.php b/src/Latte/Compiler/Node.php
new file mode 100644
index 000000000..06288ed18
--- /dev/null
+++ b/src/Latte/Compiler/Node.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of the Latte (https://latte.nette.org)
+ * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Latte\Compiler;
+
+
+
+interface Node
+{
+}
diff --git a/src/Latte/Compiler/RootNode.php b/src/Latte/Compiler/RootNode.php
new file mode 100644
index 000000000..94d6db606
--- /dev/null
+++ b/src/Latte/Compiler/RootNode.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of the Latte (https://latte.nette.org)
+ * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Latte\Compiler;
+
+
+
+class RootNode implements Node
+{
+	/** @var Node[] */
+	public $children = [];
+}
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
index 3c4ab59c3..ce35764c7 100644
--- a/src/Latte/Macros/BlockMacros.php
+++ b/src/Latte/Macros/BlockMacros.php
@@ -206,7 +206,7 @@ public function macroImport(MacroNode $node, PhpWriter $writer): string
 		if ($this->getCompiler()->isInHead()) {
 			$this->imports[] = $code;
 			return '';
-		} elseif ($node->parentNode && $node->parentNode->name === 'embed') {
+		} elseif ($node->getParentMacroNode() && $node->parentNode->name === 'embed') {
 			return "} $code if (false) {";
 		} else {
 			return $code;
@@ -220,7 +220,7 @@ public function macroImport(MacroNode $node, PhpWriter $writer): string
 	public function macroExtends(MacroNode $node, PhpWriter $writer): void
 	{
 		$node->validate(true);
-		if ($node->parentNode) {
+		if ($node->getParentMacroNode()) {
 			throw new CompileException($node->getNotation() . ' must not be inside other tags.');
 		} elseif ($this->extends !== null) {
 			throw new CompileException('Multiple ' . $node->getNotation() . ' declarations are not allowed.');
@@ -281,7 +281,7 @@ public function macroBlock(MacroNode $node, PhpWriter $writer)
 			throw new CompileException("Block name must start with letter a-z, '$data->name' given.");
 		}
 
-		$extendsCheck = $this->blocks[Template::LAYER_TOP] || count($this->blocks) > 1 || $node->parentNode;
+		$extendsCheck = $this->blocks[Template::LAYER_TOP] || count($this->blocks) > 1 || $node->getParentMacroNode();
 		$block = $this->addBlock($node, $layer);
 
 		$data->after = function () use ($node, $block) {
@@ -344,7 +344,7 @@ public function macroDefine(MacroNode $node, PhpWriter $writer): string
 			}
 		}
 
-		$extendsCheck = $this->blocks[Template::LAYER_TOP] || count($this->blocks) > 1 || $node->parentNode;
+		$extendsCheck = $this->blocks[Template::LAYER_TOP] || count($this->blocks) > 1 || $node->getParentMacroNode();
 		$block = $this->addBlock($node, $layer);
 		$block->hasParameters = (bool) $params;
 
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
index af324d047..1d66dbcf4 100644
--- a/src/Latte/Macros/CoreMacros.php
+++ b/src/Latte/Macros/CoreMacros.php
@@ -187,7 +187,7 @@ public function macroElse(MacroNode $node, PhpWriter $writer): string
 		}
 		$node->validate(false, ['if', 'ifset', 'foreach', 'ifchanged', 'try', 'first', 'last', 'sep']);
 
-		$parent = $node->parentNode;
+		$parent = $node->getParentMacroNode();
 		if (isset($parent->data->else)) {
 			throw new CompileException('Tag ' . $parent->getNotation() . ' may only contain one {else} clause.');
 		}
@@ -220,7 +220,7 @@ public function macroElse(MacroNode $node, PhpWriter $writer): string
 	public function macroElseIf(MacroNode $node, PhpWriter $writer): string
 	{
 		$node->validate(true, ['if', 'ifset']);
-		if (isset($node->parentNode->data->else) || !empty($node->parentNode->data->capture)) {
+		if (isset($node->getParentMacroNode()->data->else) || !empty($node->getParentMacroNode()->data->capture)) {
 			throw new CompileException('Tag ' . $node->getNotation() . ' is unexpected here.');
 		}
 
@@ -547,8 +547,8 @@ public function macroBreakContinueIf(MacroNode $node, PhpWriter $writer): string
 		}
 		$node->validate('condition');
 
-		if ($node->parentNode->prefix === $node::PREFIX_NONE) {
-			return $writer->write("if (%node.args) %node.line { echo \"</{$node->parentNode->htmlNode->name}>\\n\"; $cmd; }");
+		if ($node->getParentMacroNode()->prefix === $node::PREFIX_NONE) {
+			return $writer->write("if (%node.args) %node.line { echo \"</{$node->getParentMacroNode()->htmlNode->name}>\\n\"; $cmd; }");
 		}
 		return $writer->write("if (%node.args) %node.line $cmd;");
 	}
@@ -651,7 +651,7 @@ public function macroDebugbreak(MacroNode $node, PhpWriter $writer): string
 	public function macroCase(MacroNode $node, PhpWriter $writer): string
 	{
 		$node->validate(true, ['switch']);
-		if (isset($node->parentNode->data->default)) {
+		if (isset($node->getParentMacroNode()->data->default)) {
 			throw new CompileException('Tag {default} must follow after {case} clause.');
 		}
 		return $writer->write('} elseif (in_array($ʟ_switch, %node.array, true)) %node.line {');
@@ -665,12 +665,16 @@ public function macroCase(MacroNode $node, PhpWriter $writer): string
 	 */
 	public function macroVar(MacroNode $node, PhpWriter $writer): string
 	{
-		if ($node->name === 'default' && $node->parentNode && $node->parentNode->name === 'switch') {
+		if (
+			$node->name === 'default'
+			&& $node->getParentMacroNode()
+			&& $node->getParentMacroNode()->name === 'switch'
+		) {
 			$node->validate(false, ['switch']);
-			if (isset($node->parentNode->data->default)) {
+			if (isset($node->getParentMacroNode()->data->default)) {
 				throw new CompileException('Tag {switch} may only contain one {default} clause.');
 			}
-			$node->parentNode->data->default = true;
+			$node->getParentMacroNode()->data->default = true;
 			return $writer->write('} else %node.line {');
 
 		} elseif ($node->modifiers) {

From a575495d3e25fd37ac8ac6617e7cb9458a62e618 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 23 Mar 2021 19:25:04 +0100
Subject: [PATCH 19/20] Filters: compatibility with JS binding II.

---
 src/Latte/Runtime/Filters.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Latte/Runtime/Filters.php b/src/Latte/Runtime/Filters.php
index 53627684a..232b63e4c 100644
--- a/src/Latte/Runtime/Filters.php
+++ b/src/Latte/Runtime/Filters.php
@@ -48,7 +48,7 @@ public static function escapeHtmlText($s): string
 			return $s->__toString(true);
 		}
 		$s = htmlspecialchars((string) $s, ENT_NOQUOTES | ENT_SUBSTITUTE, 'UTF-8');
-		$s = str_replace('{{', '{<!-- -->{', $s);
+		$s = strtr($s, ['{{' => '{<!-- -->{', '{' => '&#123;']);
 		return $s;
 	}
 
@@ -64,7 +64,9 @@ public static function escapeHtmlAttr($s, bool $double = true): string
 		if (strpos($s, '`') !== false && strpbrk($s, ' <>"\'') === false) {
 			$s .= ' '; // protection against innerHTML mXSS vulnerability nette/nette#1496
 		}
-		return htmlspecialchars($s, ENT_QUOTES | ENT_HTML5 | ENT_SUBSTITUTE, 'UTF-8', $double);
+		$s = htmlspecialchars($s, ENT_QUOTES | ENT_HTML5 | ENT_SUBSTITUTE, 'UTF-8', $double);
+		$s = str_replace('{', '&#123;', $s);
+		return $s;
 	}
 
 

From 74c7abf7ae79542b2d4779ab1683ed170c8e38f1 Mon Sep 17 00:00:00 2001
From: Martin Jonas <martin.jonas@growjob.com>
Date: Mon, 27 Sep 2021 10:41:11 +0200
Subject: [PATCH 20/20] Propagate variable types to generated code to allow
 statical analysis

---
 src/Latte/Compiler/Compiler.php               | 10 ++--
 src/Latte/Macros/BlockMacros.php              | 13 +++--
 src/Latte/Macros/CoreMacros.php               | 22 +++++++--
 tests/Latte/BlockMacros.define.args.phpt      | 23 +++++++++
 tests/Latte/CoreMacros.parameters.phpt        | 13 ++++-
 tests/Latte/CoreMacros.varType.phpt           | 22 +++++++++
 .../expected/BlockMacros.define.args6.html    |  7 +++
 .../expected/BlockMacros.define.args6.phtml   | 49 +++++++++++++++++++
 tests/Latte/expected/CoreMacros.varType.phtml | 15 ++++++
 9 files changed, 161 insertions(+), 13 deletions(-)
 create mode 100644 tests/Latte/expected/BlockMacros.define.args6.html
 create mode 100644 tests/Latte/expected/BlockMacros.define.args6.phtml
 create mode 100644 tests/Latte/expected/CoreMacros.varType.phtml

diff --git a/src/Latte/Compiler/Compiler.php b/src/Latte/Compiler/Compiler.php
index 889acb3e6..734d35f29 100644
--- a/src/Latte/Compiler/Compiler.php
+++ b/src/Latte/Compiler/Compiler.php
@@ -57,9 +57,12 @@ class Compiler
 	/** @var string[] @internal */
 	public $placeholders = [];
 
-	/** @var string|null */
+	/** @var string */
 	public $paramsExtraction;
 
+	/** @var string */
+	private $defaultParamsExtraction = 'extract($this->params);';
+
 	/** @var Token[] */
 	private $tokens;
 
@@ -174,7 +177,8 @@ private function buildClassBody(array $tokens): string
 		$this->output = &$output;
 		$this->inHead = true;
 		$this->macroNode = new RootNode;
-		$this->htmlNode = $this->context = $this->paramsExtraction = null;
+		$this->htmlNode = $this->context = null;
+		$this->paramsExtraction = $this->defaultParamsExtraction;
 		$this->placeholders = $this->properties = $this->constants = [];
 		$this->methods = ['main' => null, 'prepare' => null];
 
@@ -223,7 +227,7 @@ private function buildClassBody(array $tokens): string
 			$epilogs = (empty($res[1]) ? '' : "<?php $res[1] ?>") . $epilogs;
 		}
 
-		$extractParams = $this->paramsExtraction ?? 'extract($this->params);';
+		$extractParams = $this->paramsExtraction;
 		$this->addMethod('main', $this->expandTokens($extractParams . "?>\n$output$epilogs<?php return get_defined_vars();"), '', 'array');
 
 		if ($prepare) {
diff --git a/src/Latte/Macros/BlockMacros.php b/src/Latte/Macros/BlockMacros.php
index ce35764c7..ac83fcfa5 100644
--- a/src/Latte/Macros/BlockMacros.php
+++ b/src/Latte/Macros/BlockMacros.php
@@ -325,15 +325,20 @@ public function macroDefine(MacroNode $node, PhpWriter $writer): string
 		$tokens = $node->tokenizer;
 		$params = [];
 		while ($tokens->isNext()) {
-			if ($tokens->nextToken($tokens::T_SYMBOL, '?', 'null', '\\')) { // type
-				$tokens->nextAll($tokens::T_SYMBOL, '\\', '|', '[', ']', 'null');
+			$type = $tokens->nextValue($tokens::T_SYMBOL, '?', 'null', '\\');
+			if ($type) {
+				$type .= $tokens->joinAll($tokens::T_SYMBOL, '\\', '|', '[', ']', 'null');
 			}
 			$param = $tokens->consumeValue($tokens::T_VARIABLE);
 			$default = $tokens->nextToken('=')
 				? $tokens->joinUntilSameDepth(',')
 				: 'null';
+			$mask ='%raw = $ʟ_args[%var] ?? $ʟ_args[%var] ?? %raw;';
+			if($type) {
+			  $mask = "/** @var $type $param */\n" . $mask;
+			}
 			$params[] = $writer->write(
-				'%raw = $ʟ_args[%var] ?? $ʟ_args[%var] ?? %raw;',
+				$mask,
 				$param,
 				count($params),
 				substr($param, 1),
@@ -547,7 +552,7 @@ private function addBlock(MacroNode $node, string $layer = null): Block
 	private function extractMethod(MacroNode $node, Block $block, string $params = null): void
 	{
 		if (preg_match('#\$|n:#', $node->content)) {
-			$node->content = '<?php extract(' . ($node->name === 'block' && $node->closest(['embed']) ? 'end($this->varStack)' : '$this->params') . ');'
+			$node->content = '<?php ' . ($node->name === 'block' && $node->closest(['embed']) ? 'extract(end($this->varStack));' : $this->getCompiler()->paramsExtraction)
 				. ($params ?? 'extract($ʟ_args);')
 				. 'unset($ʟ_args);?>'
 				. $node->content;
diff --git a/src/Latte/Macros/CoreMacros.php b/src/Latte/Macros/CoreMacros.php
index 1d66dbcf4..2b76ff88d 100644
--- a/src/Latte/Macros/CoreMacros.php
+++ b/src/Latte/Macros/CoreMacros.php
@@ -819,15 +819,20 @@ public function macroParameters(MacroNode $node, PhpWriter $writer): void
 		$tokens = $node->tokenizer;
 		$params = [];
 		while ($tokens->isNext()) {
-			if ($tokens->nextToken($tokens::T_SYMBOL, '?', 'null', '\\')) { // type
-				$tokens->nextAll($tokens::T_SYMBOL, '\\', '|', '[', ']', 'null');
+			$type = $tokens->nextValue($tokens::T_SYMBOL, '?', 'null', '\\');
+			if ($type) {
+				$type .= $tokens->joinAll($tokens::T_SYMBOL, '\\', '|', '[', ']', 'null');
 			}
 			$param = $tokens->consumeValue($tokens::T_VARIABLE);
 			$default = $tokens->nextToken('=')
 				? $tokens->joinUntilSameDepth(',')
 				: 'null';
+			$mask ='%raw = $this->params[%var] ?? $this->params[%var] ?? %raw;';
+			if($type) {
+			  $mask = "/** @var $type $param */\n" . $mask;
+			}
 			$params[] = $writer->write(
-				'%raw = $this->params[%var] ?? $this->params[%var] ?? %raw;',
+				$mask,
 				$param,
 				count($params),
 				substr($param, 1),
@@ -844,7 +849,7 @@ public function macroParameters(MacroNode $node, PhpWriter $writer): void
 	/**
 	 * {varType type $var}
 	 */
-	public function macroVarType(MacroNode $node): void
+	public function macroVarType(MacroNode $node, PhpWriter $writer): string
 	{
 		if ($node->modifiers) {
 			$node->setArgs($node->args . $node->modifiers);
@@ -853,10 +858,17 @@ public function macroVarType(MacroNode $node): void
 		$node->validate(true);
 
 		$type = trim($node->tokenizer->joinUntil($node->tokenizer::T_VARIABLE));
-		$variable = $node->tokenizer->nextToken($node->tokenizer::T_VARIABLE);
+		$variable = $node->tokenizer->nextValue($node->tokenizer::T_VARIABLE);
 		if (!$type || !$variable) {
 			throw new CompileException('Unexpected content, expecting {varType type $var}.');
 		}
+		$comment = "/** @var $type $variable */\n";
+		if ($this->getCompiler()->isInHead()) {
+			$this->getCompiler()->paramsExtraction = $comment . $this->getCompiler()->paramsExtraction;
+			return "";
+		} else {
+			return $writer->write($comment);
+		}
 	}
 
 
diff --git a/tests/Latte/BlockMacros.define.args.phpt b/tests/Latte/BlockMacros.define.args.phpt
index bbf1f37b0..13765c83f 100644
--- a/tests/Latte/BlockMacros.define.args.phpt
+++ b/tests/Latte/BlockMacros.define.args.phpt
@@ -157,3 +157,26 @@ Assert::matchFile(
 	__DIR__ . '/expected/BlockMacros.define.args5.html',
 	$latte->renderToString($template)
 );
+
+// types
+$latte->setLoader(new Latte\Loaders\StringLoader);
+$template = <<<'XX'
+default values
+
+{define test $var1 = 0, array $var2 = [1, 2, 3], int $var3 = 10}
+	Variables {$var1}, {$var2|implode}, {$var3}
+{/define}
+
+a) {include test, 1}
+
+b) {include test, var1 => 1}
+XX;
+
+Assert::matchFile(
+	__DIR__ . '/expected/BlockMacros.define.args6.phtml',
+	$latte->compile($template)
+);
+Assert::matchFile(
+	__DIR__ . '/expected/BlockMacros.define.args6.html',
+	$latte->renderToString($template)
+);
diff --git a/tests/Latte/CoreMacros.parameters.phpt b/tests/Latte/CoreMacros.parameters.phpt
index d30ec5381..787936950 100644
--- a/tests/Latte/CoreMacros.parameters.phpt
+++ b/tests/Latte/CoreMacros.parameters.phpt
@@ -19,17 +19,28 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 	'main3' => '{include inc3.latte, a: 10}',
 	'main4' => '{include inc4.latte, a: 10}',
 	'main5' => '{include inc5.latte, a: 10}',
+	'main6' => '{include inc6.latte, a: 10}',
+	'main7' => '{include inc7.latte, a: 10}',
+	'main8' => '{include inc8.latte, a: 10}',
 
 	'inc1.latte' => '{$a ?? "-"} {$b ?? "-"} {$glob ?? "-"}',
 	'inc2.latte' => '{parameters $a} {$a ?? "-"} {$b ?? "-"} {$glob ?? "-"}',
 	'inc3.latte' => '{parameters int $a = 5} {$a ?? "-"} {$b ?? "-"} {$glob ?? "-"}',
 	'inc4.latte' => '{parameters $a, int $b = 5} {$a ?? "-"} {$b ?? "-"} {$glob ?? "-"}',
 	'inc5.latte' => '{parameters $glob} {$a ?? "-"} {$b ?? "-"} {$glob ?? "-"}',
+	'inc6.latte' => '{parameters ?\Exception $glob} {$a ?? "-"} {$b ?? "-"} {$glob->getMessage() ?? "-"}',
+	'inc7.latte' => '{parameters $a, int $b = 5} {block x}{$a ?? "-"} {$b ?? "-"} {$glob ?? "-"}{/block}',
+	'inc8.latte' => '{parameters $a, int $b = 5} {define x}{$a ?? "-"} {$b ?? "-"} {$glob ?? "-"}{/define}{include x}',
 ]));
 
-
 Assert::same('10 - 123', $latte->renderToString('main1', ['glob' => 123]));
 Assert::same(' 10 - -', $latte->renderToString('main2', ['glob' => 123]));
 Assert::same(' 10 - -', $latte->renderToString('main3', ['glob' => 123]));
 Assert::same(' 10 5 -', $latte->renderToString('main4', ['glob' => 123]));
 Assert::same(' - - 123', $latte->renderToString('main5', ['glob' => 123]));
+Assert::same(' - - 123', $latte->renderToString('main6', ['glob' => new \Exception("123")]));
+Assert::same(' 10 5 -', $latte->renderToString('main7', ['glob' => 123]));
+Assert::same(' 10 5 -', $latte->renderToString('main8', ['glob' => 123]));
+
+Assert::contains('/** @var int $a */', $latte->compile('inc3.latte'));
+Assert::contains('/** @var ?\Exception $glob */', $latte->compile('inc6.latte'));
diff --git a/tests/Latte/CoreMacros.varType.phpt b/tests/Latte/CoreMacros.varType.phpt
index d9b0614e9..e477fa7ef 100644
--- a/tests/Latte/CoreMacros.varType.phpt
+++ b/tests/Latte/CoreMacros.varType.phpt
@@ -46,3 +46,25 @@ Assert::noError(function () use ($latte) {
 Assert::noError(function () use ($latte) {
 	$latte->compile('{varType array{0: int, 1: int} $var}');
 });
+
+Assert::contains('/** @var int|null $var */', $latte->compile('{varType int|null $var}'));
+
+$template = <<<'XX'
+{varType string $a}
+
+{$a}
+
+{include test}
+
+{define test}
+  {varType int $b}
+  {var $b = 5}
+  {$a}{$b}
+{/define}
+
+XX;
+
+Assert::matchFile(
+	__DIR__ . '/expected/CoreMacros.varType.phtml',
+	$latte->compile($template)
+);
\ No newline at end of file
diff --git a/tests/Latte/expected/BlockMacros.define.args6.html b/tests/Latte/expected/BlockMacros.define.args6.html
new file mode 100644
index 000000000..128d3f783
--- /dev/null
+++ b/tests/Latte/expected/BlockMacros.define.args6.html
@@ -0,0 +1,7 @@
+default values
+
+
+a) 	Variables 1, 123, 10
+
+
+b) 	Variables 1, 123, 10
diff --git a/tests/Latte/expected/BlockMacros.define.args6.phtml b/tests/Latte/expected/BlockMacros.define.args6.phtml
new file mode 100644
index 000000000..fb4fee684
--- /dev/null
+++ b/tests/Latte/expected/BlockMacros.define.args6.phtml
@@ -0,0 +1,49 @@
+<?php
+%A%
+final class Template%a% extends Latte\Runtime\Template
+{
+	protected const BLOCKS = [
+		['test' => 'blockTest'],
+	];
+
+
+	public function main(): array
+	{
+		extract($this->params);
+		echo 'default values
+
+';
+		if ($this->getParentName()) {
+			return get_defined_vars();
+		}
+		echo '
+a) ';
+		$this->renderBlock('test', [1] + [], 'html') /* line %d% */;
+		echo '
+
+b) ';
+		$this->renderBlock('test', ['var1' => 1] + [], 'html') /* line %d% */;
+		return get_defined_vars();
+	}
+
+
+	/** {define test $var1 = 0, array $var2 = [1, 2, 3], int $var3 = 10} on line %d% */
+	public function blockTest(array $ʟ_args): void
+	{
+		extract($this->params);
+		$var1 = $ʟ_args[0] ?? $ʟ_args['var1'] ??  0;
+		/** @var array $var2 */
+		$var2 = $ʟ_args[1] ?? $ʟ_args['var2'] ??  [1, 2, 3];
+		/** @var int $var3 */
+		$var3 = $ʟ_args[2] ?? $ʟ_args['var3'] ??  10;
+		unset($ʟ_args);
+		echo '	Variables ';
+		echo LR\Filters::escapeHtmlText($var1) /* line %d% */;
+		echo ', ';
+		echo LR\Filters::escapeHtmlText(($this->filters->implode)($var2)) /* line %d% */;
+		echo ', ';
+		echo LR\Filters::escapeHtmlText($var3) /* line %d% */;
+		echo "\n";
+	}
+
+}
diff --git a/tests/Latte/expected/CoreMacros.varType.phtml b/tests/Latte/expected/CoreMacros.varType.phtml
new file mode 100644
index 000000000..e1faf10b6
--- /dev/null
+++ b/tests/Latte/expected/CoreMacros.varType.phtml
@@ -0,0 +1,15 @@
+<?php
+%A%
+	public function main(): array
+	{
+		/** @var string $a */
+		extract($this->params);
+%A%
+	public function blockTest(array $ʟ_args): void
+	{
+		/** @var string $a */
+		extract($this->params);
+%A%
+		/** @var int $b */
+		$b = 5%a%;
+%A%
\ No newline at end of file