From 85e0340b5e24e99049bd3e745e3f9c39ab83448e Mon Sep 17 00:00:00 2001 From: David Grudl Date: Wed, 1 Mar 2023 10:41:44 +0100 Subject: [PATCH] LatteExtension: added options strictParsing & phpLinter --- composer.json | 2 +- src/Bridges/ApplicationDI/LatteExtension.php | 5 +++++ src/Bridges/ApplicationLatte/Nodes/ControlNode.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index aca070708..e712eb75c 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "nette/di": "<3.0.7", "nette/forms": "<3.0", "nette/schema": "<1.2", - "latte/latte": "<2.7.1 || >=3.0.0 <3.0.5 || >=3.1", + "latte/latte": "<2.7.1 || >=3.0.0 <3.0.8 || >=3.1", "tracy/tracy": "<2.5" }, "autoload": { diff --git a/src/Bridges/ApplicationDI/LatteExtension.php b/src/Bridges/ApplicationDI/LatteExtension.php index c50846f36..608e7982a 100644 --- a/src/Bridges/ApplicationDI/LatteExtension.php +++ b/src/Bridges/ApplicationDI/LatteExtension.php @@ -44,6 +44,8 @@ public function getConfigSchema(): Nette\Schema\Schema 'extensions' => Expect::arrayOf('string|Nette\DI\Definitions\Statement'), 'templateClass' => Expect::string(), 'strictTypes' => Expect::bool(false), + 'strictParsing' => Expect::bool(false), + 'phpLinter' => Expect::string(), ]); } @@ -74,6 +76,9 @@ public function loadConfiguration() $this->addMacro($macro); } } else { + $latteFactory->addSetup('setStrictParsing', [$config->strictParsing]) + ->addSetup('enablePhpLinter', [$config->phpLinter]); + foreach ($config->extensions as $extension) { $this->addExtension($extension); } diff --git a/src/Bridges/ApplicationLatte/Nodes/ControlNode.php b/src/Bridges/ApplicationLatte/Nodes/ControlNode.php index 17ac64df1..2a28c4640 100644 --- a/src/Bridges/ApplicationLatte/Nodes/ControlNode.php +++ b/src/Bridges/ApplicationLatte/Nodes/ControlNode.php @@ -11,7 +11,7 @@ use Latte; use Latte\Compiler\Escaper; -use Latte\Compiler\Nodes\Php\Expression\ArrayItemNode; +use Latte\Compiler\Nodes\Php\ArrayItemNode; use Latte\Compiler\Nodes\Php\Expression\ArrayNode; use Latte\Compiler\Nodes\Php\ExpressionNode; use Latte\Compiler\Nodes\Php\ModifierNode;