@vituum/vite-plugin-latte 2.0.0-next.5 → 2.0.1

package/vendor/latte/latte/src/Latte/Runtime/Template.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Runtime;
 
 use Latte;
@@ -16,7 +14,7 @@ use function array_keys, array_merge, array_pop, end, in_array, is_array, next,
 
 
 /**
- * Template.
+ * Base class for compiled templates.
  */
 class Template
 {
@@ -29,14 +27,6 @@ class Template
 
 	public const Blocks = [];
 
-	/** global accumulators for intermediate results */
-	public \stdClass $global;
-
-	/** @var mixed[]  @internal */
-	protected array $params = [];
-
-	protected FilterExecutor $filters;
-
 	/** @internal */
 	protected string|false|null $parentName = null;
 
@@ -48,28 +38,18 @@ class Template
 
 	/** @var mixed[][] */
 	private array $blockStack = [];
-
-	private Engine $engine;
-	private string $name;
 	private ?Template $referringTemplate = null;
 	private ?string $referenceType = null;
 
 
-	/**
-	 * @param  mixed[]  $params
-	 */
 	public function __construct(
-		Engine $engine,
-		array $params,
-		FilterExecutor $filters,
-		\stdClass $providers,
-		string $name,
+		private readonly Engine $engine,
+		/** @var array<string, mixed> */
+		protected array $params,
+		protected FilterExecutor $filters,
+		public \stdClass $global,
+		private readonly string $name,
 	) {
-		$this->engine = $engine;
-		$this->params = $params;
-		$this->filters = $filters;
-		$this->name = $name;
-		$this->global = $providers;
 		$this->initBlockLayer(self::LayerTop);
 		$this->initBlockLayer(self::LayerLocal);
 		$this->initBlockLayer(self::LayerSnippet);
@@ -135,10 +115,12 @@ class Template
 			throw new Latte\RuntimeException("Cannot include undefined block '$name'$hint");
 		}
 
+		$fn = reset($block->functions);
+		assert($fn !== false);
 		$this->filter(
-			fn() => reset($block->functions)($params),
+			fn() => $fn($params),
 			$mod,
-			$block->contentType,
+			$block->contentType ?? static::ContentType,
 			"block $name",
 		);
 	}
@@ -191,9 +173,9 @@ class Template
 		$child->referenceType = $relation;
 		$child->global = $this->global;
 
-		if (in_array($relation, ['extends', 'includeblock', 'import', 'embed'], true)) {
+		if (in_array($relation, ['extends', 'includeblock', 'import', 'embed'], strict: true)) {
 			foreach ($child->blocks[self::LayerTop] as $nm => $block) {
-				$this->addBlock($nm, $block->contentType, $block->functions);
+				$this->addBlock($nm, $block->contentType ?? static::ContentType, $block->functions);
 			}
 
 			$child->blocks[self::LayerTop] = &$this->blocks[self::LayerTop];
@@ -261,7 +243,7 @@ class Template
 
 	/**
 	 * Returns array of all parameters.
-	 * @return mixed[]
+	 * @return array<string, mixed>
 	 */
 	public function getParameters(): array
 	{
@@ -287,14 +269,14 @@ class Template
 	}
 
 
-	/** @return mixed[] */
+	/** @return array<string, mixed> */
 	public function prepare(): array
 	{
 		return $this->params;
 	}
 
 
-	/** @param mixed[] $params */
+	/** @param mixed[]  $params */
 	public function main(array $params): void
 	{
 	}
@@ -305,7 +287,7 @@ class Template
 
 	/**
 	 * Creates block if doesn't exist and checks if content type is the same.
-	 * @param  callable[]  $functions
+	 * @param  \Closure[]  $functions
 	 * @internal
 	 */
 	protected function addBlock(
@@ -338,9 +320,7 @@ class Template
 	}
 
 
-	/**
-	 * @return string[]
-	 */
+	/** @return list<string> */
 	public function getBlockNames(int|string $layer = self::LayerTop): array
 	{
 		return array_keys($this->blocks[$layer] ?? []);
@@ -358,6 +338,7 @@ class Template
 	}
 
 
+	/** @param array<string, mixed> $vars */
 	protected function enterBlockLayer(int $staticId, array $vars): void
 	{
 		$this->blockStack[] = $this->blocks[self::LayerTop];
@@ -368,15 +349,15 @@ class Template
 
 	protected function copyBlockLayer(): void
 	{
-		foreach (end($this->blockStack) as $nm => $block) {
-			$this->addBlock($nm, $block->contentType, $block->functions);
+		foreach (end($this->blockStack) ?: [] as $nm => $block) {
+			$this->addBlock($nm, $block->contentType ?? static::ContentType, $block->functions);
 		}
 	}
 
 
 	protected function leaveBlockLayer(): void
 	{
-		$this->blocks[self::LayerTop] = array_pop($this->blockStack);
+		$this->blocks[self::LayerTop] = array_pop($this->blockStack) ?? [];
 		array_pop($this->varStack);
 	}
 }

package/vendor/latte/latte/src/Latte/Runtime/XmlHelpers.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Runtime;
 
 use Latte;
@@ -29,7 +27,7 @@ final class XmlHelpers
 	/**
 	 * Escapes string for use everywhere inside XML (except for comments and tags).
 	 */
-	public static function escapeText($s): string
+	public static function escapeText(mixed $s): string
 	{
 		if ($s instanceof HtmlStringable) {
 			return $s->__toString();
@@ -46,7 +44,7 @@ final class XmlHelpers
 	/**
 	 * Escapes string for use inside XML attribute value.
 	 */
-	public static function escapeAttr($s): string
+	public static function escapeAttr(mixed $s): string
 	{
 		if ($s instanceof HtmlStringable) {
 			$s = HtmlHelpers::convertHtmlToText($s->__toString());
@@ -58,7 +56,7 @@ final class XmlHelpers
 	/**
 	 * Escapes string for use inside XML tag.
 	 */
-	public static function escapeTag($s): string
+	public static function escapeTag(mixed $s): string
 	{
 		$s = self::escapeText((string) $s);
 		return preg_replace_callback(
@@ -77,7 +75,7 @@ final class XmlHelpers
 		return match (true) {
 			is_string($value), is_int($value), is_float($value), $value instanceof \Stringable => $namePart . '="' . self::escapeAttr($value) . '"',
 			$value === null => '',
-			default => HtmlHelpers::triggerInvalidValue(trim($namePart), $value) ?? '',
+			default => HtmlHelpers::triggerInvalidValue(trim($namePart), $value),
 		};
 	}
 

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/FunctionCallNode.php

@@ -1,18 +1,20 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox\Nodes;
 
+use Latte\Compiler\Nodes\Php\ArgumentNode;
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Function call routed through sandbox security policy.
+ */
 class FunctionCallNode extends Expression\FunctionCallNode
 {
 	public function __construct(Expression\FunctionCallNode $from)
@@ -23,10 +25,14 @@ class FunctionCallNode extends Expression\FunctionCallNode
 
 	public function print(PrintContext $context): string
 	{
-		return $this->isPartialFunction()
-			? '$this->global->sandbox->closure(' . $context->memberAsString($this->name) . ')'
-			: '$this->global->sandbox->call('
-				. $context->memberAsString($this->name) . ', '
-				. $context->argumentsAsArray($this->args) . ')';
+		if ($this->isPartialFunction()) {
+			return '$this->global->sandbox->closure(' . $context->memberAsString($this->name) . ')';
+		}
+
+		/** @var array<ArgumentNode> $args */
+		$args = $this->args;
+		return '$this->global->sandbox->call('
+			. $context->memberAsString($this->name) . ', '
+			. $context->argumentsAsArray($args) . ')';
 	}
 }

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/MethodCallNode.php

@@ -1,18 +1,20 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox\Nodes;
 
+use Latte\Compiler\Nodes\Php\ArgumentNode;
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Method call routed through sandbox security policy.
+ */
 class MethodCallNode extends Expression\MethodCallNode
 {
 	public function __construct(Expression\MethodCallNode $from)
@@ -23,14 +25,18 @@ class MethodCallNode extends Expression\MethodCallNode
 
 	public function print(PrintContext $context): string
 	{
-		return $this->isPartialFunction()
-			? '$this->global->sandbox->closure(['
-				. $this->object->print($context) . ', '
-				. $context->memberAsString($this->name) . '])'
-			: '$this->global->sandbox->callMethod('
+		if ($this->isPartialFunction()) {
+			return '$this->global->sandbox->closure(['
 				. $this->object->print($context) . ', '
-				. $context->memberAsString($this->name) . ', '
-				. $context->argumentsAsArray($this->args)
-				. ', ' . var_export($this->nullsafe, true) . ')';
+				. $context->memberAsString($this->name) . '])';
+		}
+
+		/** @var array<ArgumentNode> $args */
+		$args = $this->args;
+		return '$this->global->sandbox->callMethod('
+			. $this->object->print($context) . ', '
+			. $context->memberAsString($this->name) . ', '
+			. $context->argumentsAsArray($args)
+			. ', ' . var_export($this->nullsafe, return: true) . ')';
 	}
 }

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/PropertyFetchNode.php

@@ -1,18 +1,19 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox\Nodes;
 
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Property access routed through sandbox security policy.
+ */
 class PropertyFetchNode extends Expression\PropertyFetchNode
 {
 	public function __construct(Expression\PropertyFetchNode $from)

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/SandboxNode.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox\Nodes;
 
 use Latte\Compiler\Nodes\Php\Expression\ArrayNode;
@@ -17,7 +15,8 @@ use Latte\Compiler\Tag;
 
 
 /**
- * {sandbox "file" [,] [params]}
+ * {sandbox 'file.latte'}
+ * Isolated template rendering with sandbox policy.
  */
 class SandboxNode extends StatementNode
 {

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/StaticMethodCallNode.php

@@ -1,18 +1,20 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox\Nodes;
 
+use Latte\Compiler\Nodes\Php\ArgumentNode;
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Static method call routed through sandbox security policy.
+ */
 class StaticMethodCallNode extends Expression\StaticMethodCallNode
 {
 	public function __construct(Expression\StaticMethodCallNode $from)
@@ -23,13 +25,17 @@ class StaticMethodCallNode extends Expression\StaticMethodCallNode
 
 	public function print(PrintContext $context): string
 	{
-		return $this->isPartialFunction()
-			? '$this->global->sandbox->closure(['
-				. $context->memberAsString($this->class) . ', '
-				. $context->memberAsString($this->name) . '])'
-			: '$this->global->sandbox->call(['
+		if ($this->isPartialFunction()) {
+			return '$this->global->sandbox->closure(['
 				. $context->memberAsString($this->class) . ', '
-				. $context->memberAsString($this->name) . '], '
-				. $context->argumentsAsArray($this->args) . ')';
+				. $context->memberAsString($this->name) . '])';
+		}
+
+		/** @var array<ArgumentNode> $args */
+		$args = $this->args;
+		return '$this->global->sandbox->call(['
+			. $context->memberAsString($this->class) . ', '
+			. $context->memberAsString($this->name) . '], '
+			. $context->argumentsAsArray($args) . ')';
 	}
 }

package/vendor/latte/latte/src/Latte/Sandbox/Nodes/StaticPropertyFetchNode.php

@@ -1,18 +1,19 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox\Nodes;
 
 use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\PrintContext;
 
 
+/**
+ * Static property access routed through sandbox security policy.
+ */
 class StaticPropertyFetchNode extends Expression\StaticPropertyFetchNode
 {
 	public function __construct(Expression\StaticPropertyFetchNode $from)

package/vendor/latte/latte/src/Latte/Sandbox/RuntimeChecker.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox;
 
 use Latte;
@@ -22,6 +20,7 @@ final class RuntimeChecker
 	}
 
 
+	/** @param  array<mixed>  $args */
 	public function call(mixed $callable, array $args): mixed
 	{
 		self::checkCallable($callable);
@@ -30,6 +29,7 @@ final class RuntimeChecker
 	}
 
 
+	/** @param  array<mixed>  $args */
 	public function callMethod(mixed $object, mixed $method, array $args, bool $nullsafe = false): mixed
 	{
 		if ($object === null) {
@@ -53,11 +53,12 @@ final class RuntimeChecker
 	public function closure(mixed $callable): \Closure
 	{
 		self::checkCallable($callable);
-		return \Closure::fromCallable($callable);
+		return $callable(...);
 	}
 
 
-	public function args(...$args): array
+	/** @return list<mixed> */
+	public function args(mixed ...$args): array
 	{
 		foreach ($args as $arg) {
 			if (

package/vendor/latte/latte/src/Latte/Sandbox/SandboxExtension.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox;
 
 use Latte;
@@ -75,6 +73,7 @@ final class SandboxExtension extends Latte\Extension
 
 	private function sandboxVisitor(Node $node): Node
 	{
+		assert($this->policy !== null);
 		if ($node instanceof Expression\VariableNode) {
 			if ($node->name === 'this') {
 				throw new SecurityViolationException("Forbidden variable \${$node->name}.", $node->position);
@@ -130,7 +129,9 @@ final class SandboxExtension extends Latte\Extension
 			|| $node instanceof Expression\StaticMethodCallNode
 		) {
 			$class = namespace\Nodes::class . strrchr($node::class, '\\');
-			return new $class($node);
+			$result = new $class($node);
+			assert($result instanceof Node);
+			return $result;
 
 		} else {
 			return $node;

package/vendor/latte/latte/src/Latte/Sandbox/SecurityPolicy.php

@@ -1,12 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Sandbox;
 
 use Latte;
@@ -14,26 +12,26 @@ use function array_flip, array_map, assert, is_a, is_bool, strtolower;
 
 
 /**
- * Default-deny policy.
+ * Default-deny security policy. Whitelist allowed tags, filters, functions, methods and properties.
  */
 class SecurityPolicy implements Latte\Policy
 {
 	public const All = ['*'];
 	public const ALL = self::All;
 
-	/** @var string[] */
+	/** @var array<string, int> */
 	private array $tags = [];
 
-	/** @var string[] */
+	/** @var array<string, int> */
 	private array $filters = [];
 
-	/** @var string[] */
+	/** @var array<string, int> */
 	private array $functions = [];
 
-	/** @var string[][] */
+	/** @var array<string, array<string, int>> */
 	private array $methods = [];
 
-	/** @var string[][] */
+	/** @var array<string, array<string, int>> */
 	private array $properties = [];
 
 	/** @var array<string, array<string, bool>> */
@@ -43,6 +41,9 @@ class SecurityPolicy implements Latte\Policy
 	private array $propertyCache = [];
 
 
+	/**
+	 * Creates policy with safe defaults for user-generated templates.
+	 */
 	public static function createSafePolicy(): self
 	{
 		$policy = new self;
@@ -80,7 +81,7 @@ class SecurityPolicy implements Latte\Policy
 	 */
 	public function allowTags(array $tags): self
 	{
-		$this->tags += array_flip(array_map('strtolower', $tags));
+		$this->tags += array_flip(array_map(strtolower(...), $tags));
 		return $this;
 	}
 
@@ -90,7 +91,7 @@ class SecurityPolicy implements Latte\Policy
 	 */
 	public function allowFilters(array $filters): self
 	{
-		$this->filters += array_flip(array_map('strtolower', $filters));
+		$this->filters += array_flip(array_map(strtolower(...), $filters));
 		return $this;
 	}
 
@@ -100,7 +101,7 @@ class SecurityPolicy implements Latte\Policy
 	 */
 	public function allowFunctions(array $functions): self
 	{
-		$this->functions += array_flip(array_map('strtolower', $functions));
+		$this->functions += array_flip(array_map(strtolower(...), $functions));
 		return $this;
 	}
 
@@ -111,7 +112,7 @@ class SecurityPolicy implements Latte\Policy
 	public function allowMethods(string $class, array $methods): self
 	{
 		$this->methodCache = [];
-		$this->methods[$class] = array_flip(array_map('strtolower', $methods));
+		$this->methods[$class] = array_flip(array_map(strtolower(...), $methods));
 		return $this;
 	}
 
@@ -122,7 +123,7 @@ class SecurityPolicy implements Latte\Policy
 	public function allowProperties(string $class, array $properties): self
 	{
 		$this->propertyCache = [];
-		$this->properties[$class] = array_flip(array_map('strtolower', $properties));
+		$this->properties[$class] = array_flip(array_map(strtolower(...), $properties));
 		return $this;
 	}
 
@@ -155,7 +156,7 @@ class SecurityPolicy implements Latte\Policy
 		}
 
 		foreach ($this->methods as $c => $methods) {
-			if (is_a($class, $c, true) && (isset($methods[$method]) || isset($methods['*']))) {
+			if (is_a($class, $c, allow_string: true) && (isset($methods[$method]) || isset($methods['*']))) {
 				return $res = true;
 			}
 		}
@@ -174,7 +175,7 @@ class SecurityPolicy implements Latte\Policy
 		}
 
 		foreach ($this->properties as $c => $properties) {
-			if (is_a($class, $c, true) && (isset($properties[$property]) || isset($properties['*']))) {
+			if (is_a($class, $c, allow_string: true) && (isset($properties[$property]) || isset($properties['*']))) {
 				return $res = true;
 			}
 		}

package/vendor/latte/latte/src/Latte/attributes.php

@@ -1,23 +1,27 @@
-<?php
+<?php declare(strict_types=1);
 
 /**
  * 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\Attributes;
 
 use Attribute;
 
 
+/**
+ * Marks method as a template function.
+ */
 #[Attribute(Attribute::TARGET_METHOD)]
 class TemplateFunction
 {
 }
 
 
+/**
+ * Marks method as a template filter.
+ */
 #[Attribute(Attribute::TARGET_METHOD)]
 class TemplateFilter
 {