@vituum/vite-plugin-latte 1.2.1 → 1.4.0

package/vendor/latte/latte/src/Latte/Essential/Filters.php

@@ -23,6 +23,9 @@ use function is_array, is_string, count, strlen;
  */
 final class Filters
 {
+	public ?string $locale = null;
+
+
 	/**
 	 * Converts HTML to plain text.
 	 */
@@ -35,7 +38,7 @@ final class Filters
 
 
 	/**
-	 * Removes tags from HTML (but remains HTML entites).
+	 * Removes tags from HTML (but remains HTML entities).
 	 */
 	public static function stripTags(FilterInfo $info, $s): string
 	{
@@ -168,14 +171,11 @@ final class Filters
 	 */
 	public static function date(string|int|\DateTimeInterface|\DateInterval|null $time, ?string $format = null): ?string
 	{
+		$format ??= Latte\Runtime\Filters::$dateFormat;
 		if ($time == null) { // intentionally ==
 			return null;
-		}
-
-		$format ??= Latte\Runtime\Filters::$dateFormat;
-		if ($time instanceof \DateInterval) {
+		} elseif ($time instanceof \DateInterval) {
 			return $time->format($format);
-
 		} elseif (is_numeric($time)) {
 			$time = (new \DateTime)->setTimestamp((int) $time);
 		} elseif (!$time instanceof \DateTimeInterface) {
@@ -194,10 +194,75 @@ final class Filters
 	}
 
 
+	/**
+	 * Date/time formatting according to locale.
+	 */
+	public function localDate(
+		string|int|\DateTimeInterface|null $value,
+		?string $format = null,
+		?string $date = null,
+		?string $time = null,
+	): ?string
+	{
+		if ($this->locale === null) {
+			throw new Latte\RuntimeException('Filter |localDate requires the locale to be set using Engine::setLocale()');
+		} elseif ($value == null) { // intentionally ==
+			return null;
+		} elseif (is_numeric($value)) {
+			$value = (new \DateTime)->setTimestamp((int) $value);
+		} elseif (!$value instanceof \DateTimeInterface) {
+			$value = new \DateTime($value);
+			$errors = \DateTime::getLastErrors();
+			if (!empty($errors['warnings'])) {
+				throw new \InvalidArgumentException(reset($errors['warnings']));
+			}
+		}
+
+		if ($format === null) {
+			$xlt = ['' => \IntlDateFormatter::NONE, 'full' => \IntlDateFormatter::FULL, 'long' => \IntlDateFormatter::LONG, 'medium' => \IntlDateFormatter::MEDIUM, 'short' => \IntlDateFormatter::SHORT,
+				'relative-full' => \IntlDateFormatter::RELATIVE_FULL, 'relative-long' => \IntlDateFormatter::RELATIVE_LONG, 'relative-medium' => \IntlDateFormatter::RELATIVE_MEDIUM, 'relative-short' => \IntlDateFormatter::RELATIVE_SHORT];
+			$date ??= $time === null ? 'long' : null;
+			$formatter = new \IntlDateFormatter($this->locale, $xlt[$date], $xlt[$time]);
+		} else {
+			$formatter = new \IntlDateFormatter($this->locale, pattern: (new \IntlDatePatternGenerator($this->locale))->getBestPattern($format));
+		}
+
+		$res = $formatter->format($value);
+		$res = preg_replace('~(\d\.) ~', "\$1\u{a0}", $res);
+		return $res;
+	}
+
+
+	/**
+	 * Formats a number with grouped thousands and optionally decimal digits according to locale.
+	 */
+	public function number(
+		float $number,
+		string|int $patternOrDecimals = 0,
+		string $decimalSeparator = '.',
+		string $thousandsSeparator = ',',
+	): string
+	{
+		if (is_int($patternOrDecimals) && $patternOrDecimals < 0) {
+			throw new Latte\RuntimeException('Filter |number: the number of decimal must not be negative');
+		} elseif ($this->locale === null || func_num_args() > 2) {
+			return number_format($number, $patternOrDecimals, $decimalSeparator, $thousandsSeparator);
+		}
+
+		$formatter = new \NumberFormatter($this->locale, \NumberFormatter::DECIMAL);
+		if (is_string($patternOrDecimals)) {
+			$formatter->setPattern($patternOrDecimals);
+		} else {
+			$formatter->setAttribute(\NumberFormatter::FRACTION_DIGITS, $patternOrDecimals);
+		}
+		return $formatter->format($number);
+	}
+
+
 	/**
 	 * Converts to human-readable file size.
 	 */
-	public static function bytes(float $bytes, int $precision = 2): string
+	public function bytes(float $bytes, int $precision = 2): string
 	{
 		$bytes = round($bytes);
 		$units = ['B', 'kB', 'MB', 'GB', 'TB', 'PB'];
@@ -209,7 +274,15 @@ final class Filters
 			$bytes /= 1024;
 		}
 
-		return round($bytes, $precision) . ' ' . $unit;
+		if ($this->locale === null) {
+			$bytes = (string) round($bytes, $precision);
+		} else {
+			$formatter = new \NumberFormatter($this->locale, \NumberFormatter::DECIMAL);
+			$formatter->setAttribute(\NumberFormatter::MAX_FRACTION_DIGITS, $precision);
+			$bytes = $formatter->format($bytes);
+		}
+
+		return $bytes . ' ' . $unit;
 	}
 
 
@@ -455,7 +528,7 @@ final class Filters
 	 * @param  iterable<K, V>  $data
 	 * @return iterable<K, V>
 	 */
-	public static function sort(
+	public function sort(
 		iterable $data,
 		?\Closure $comparison = null,
 		string|int|\Closure|null $by = null,
@@ -469,7 +542,16 @@ final class Filters
 			$by = $byKey === true ? null : $byKey;
 		}
 
-		$comparison ??= fn($a, $b) => $a <=> $b;
+		if ($comparison) {
+		} elseif ($this->locale === null) {
+			$comparison = fn($a, $b) => $a <=> $b;
+		} else {
+			$collator = new \Collator($this->locale);
+			$comparison = fn($a, $b) => is_string($a) && is_string($b)
+				? $collator->compare($a, $b)
+				: $a <=> $b;
+		}
+
 		$comparison = match (true) {
 			$by === null => $comparison,
 			$by instanceof \Closure => fn($a, $b) => $comparison($by($a), $by($b)),
@@ -524,6 +606,24 @@ final class Filters
 	}
 
 
+	/**
+	 * Filters elements according to a given $predicate. Maintains original keys.
+	 * @template K
+	 * @template V
+	 * @param  iterable<K, V>  $iterable
+	 * @param  callable(V, K, iterable<K, V>): bool  $predicate
+	 * @return iterable<K, V>
+	 */
+	public static function filter(iterable $iterable, callable $predicate): iterable
+	{
+		foreach ($iterable as $k => $v) {
+			if ($predicate($v, $k, $iterable)) {
+				yield $k => $v;
+			}
+		}
+	}
+
+
 	/**
 	 * Returns value clamped to the inclusive range of min and max.
 	 */

package/vendor/latte/latte/src/Latte/Essential/Nodes/ImportNode.php

@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 namespace Latte\Essential\Nodes;
 
+use Latte\Compiler\Nodes\Php\Expression\ArrayNode;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
@@ -16,11 +17,12 @@ use Latte\Compiler\Tag;
 
 
 /**
- * {import "file"}
+ * {import "file"[, args]}
  */
 class ImportNode extends StatementNode
 {
 	public ExpressionNode $file;
+	public ArrayNode $args;
 
 
 	public static function create(Tag $tag): static
@@ -28,6 +30,8 @@ class ImportNode extends StatementNode
 		$tag->expectArguments();
 		$node = new static;
 		$node->file = $tag->parser->parseUnquotedStringOrExpression();
+		$tag->parser->stream->tryConsume(',');
+		$node->args = $tag->parser->parseArguments();
 		return $node;
 	}
 
@@ -35,8 +39,9 @@ class ImportNode extends StatementNode
 	public function print(PrintContext $context): string
 	{
 		return $context->format(
-			'$this->createTemplate(%node, $this->params, "import")->render() %line;',
+			'$this->createTemplate(%node, %node? + $this->params, "import")->render() %line;',
 			$this->file,
+			$this->args,
 			$this->position,
 		);
 	}
@@ -45,5 +50,6 @@ class ImportNode extends StatementNode
 	public function &getIterator(): \Generator
 	{
 		yield $this->file;
+		yield $this->args;
 	}
 }

package/vendor/latte/latte/src/Latte/Essential/Nodes/VarNode.php

@@ -10,8 +10,10 @@ declare(strict_types=1);
 namespace Latte\Essential\Nodes;
 
 use Latte\Compiler\Nodes\Php\Expression\AssignNode;
+use Latte\Compiler\Nodes\Php\Expression\AssignOpNode;
+use Latte\Compiler\Nodes\Php\Expression\AuxiliaryNode;
+use Latte\Compiler\Nodes\Php\Expression\TernaryNode;
 use Latte\Compiler\Nodes\Php\Expression\VariableNode;
-use Latte\Compiler\Nodes\Php\ExpressionNode;
 use Latte\Compiler\Nodes\Php\Scalar\NullNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
@@ -67,25 +69,19 @@ class VarNode extends StatementNode
 	public function print(PrintContext $context): string
 	{
 		$res = [];
-		if ($this->default) {
-			foreach ($this->assignments as $assign) {
+		foreach ($this->assignments as $assign) {
+			if ($this->default) {
 				assert($assign->var instanceof VariableNode);
-				if ($assign->var->name instanceof ExpressionNode) {
-					$var = $assign->var->name->print($context);
-				} else {
-					$var = $context->encodeString($assign->var->name);
-				}
-				$res[] = $var . ' => ' . $assign->expr->print($context);
+				$assign = new AssignOpNode(
+					$assign->var,
+					'??',
+					new TernaryNode(
+						new AuxiliaryNode(fn() => 'array_key_exists(' . $context->encodeString($assign->var->name) . ', get_defined_vars())'),
+						new NullNode,
+						$assign->expr,
+					),
+				);
 			}
-
-			return $context->format(
-				'extract([%raw], EXTR_SKIP) %line;',
-				implode(', ', $res),
-				$this->position,
-			);
-		}
-
-		foreach ($this->assignments as $assign) {
 			$res[] = $assign->print($context);
 		}
 

package/vendor/latte/latte/src/Latte/Essential/TranslatorExtension.php

@@ -50,7 +50,7 @@ final class TranslatorExtension extends Latte\Extension
 	public function getFilters(): array
 	{
 		return [
-			'translate' => fn(Latte\Runtime\FilterInfo $fi, ...$args): string => $this->translator
+			'translate' => fn(Latte\Runtime\FilterInfo $fi, ...$args) => $this->translator
 				? ($this->translator)(...$args)
 				: $args[0],
 		];

package/vendor/latte/latte/src/Latte/Loaders/FileLoader.php

@@ -59,7 +59,7 @@ class FileLoader implements Latte\Loader
 	 */
 	public function getReferredName(string $file, string $referringFile): string
 	{
-		if ($this->baseDir || !preg_match('#/|\\\\|[a-z][a-z0-9+.-]*:#iA', $file)) {
+		if ($this->baseDir || !preg_match('#/|\\\\|[a-z]:|phar:#iA', $file)) {
 			$file = $this->normalizePath($referringFile . '/../' . $file);
 		}
 
@@ -78,15 +78,16 @@ class FileLoader implements Latte\Loader
 
 	protected static function normalizePath(string $path): string
 	{
+		preg_match('#^([a-z]:|phar://.+?/)?(.*)#i', $path, $m);
 		$res = [];
-		foreach (explode('/', strtr($path, '\\', '/')) as $part) {
-			if ($part === '..' && $res && end($res) !== '..') {
+		foreach (explode('/', strtr($m[2], '\\', '/')) as $part) {
+			if ($part === '..' && $res && end($res) !== '..' && end($res) !== '') {
 				array_pop($res);
 			} elseif ($part !== '.') {
 				$res[] = $part;
 			}
 		}
 
-		return implode(DIRECTORY_SEPARATOR, $res);
+		return $m[1] . implode(DIRECTORY_SEPARATOR, $res);
 	}
 }

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

@@ -138,7 +138,7 @@ class Template
 
 		$params = $this->prepare();
 
-		if ($this->parentName === null && isset($this->global->coreParentFinder)) {
+		if ($this->parentName === null && !$this->referringTemplate && isset($this->global->coreParentFinder)) {
 			$this->parentName = ($this->global->coreParentFinder)($this);
 		}
 

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

@@ -26,6 +26,5 @@ class FunctionCallNode extends Expression\FunctionCallNode
 		return '$this->global->sandbox->call('
 			. $context->memberAsString($this->name) . ', '
 			. $context->argumentsAsArray($this->args) . ')';
-
 	}
 }

package/vendor/nette/utils/composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": ">=8.0 <8.4"
+		"php": "8.0 - 8.4"
 	},
 	"require-dev": {
 		"nette/tester": "^2.5",

package/vendor/nette/utils/readme.md

@@ -1,5 +1,4 @@
-Nette Utility Classes
-=====================
+[![Nette Utils](https://github.com/nette/utils/assets/194960/c33fdb74-0652-4cad-ac6e-c1ce0d29e32a)](https://doc.nette.org/en/utils)
 
 [![Downloads this Month](https://img.shields.io/packagist/dm/nette/utils.svg)](https://packagist.org/packages/nette/utils)
 [![Tests](https://github.com/nette/utils/workflows/Tests/badge.svg?branch=master)](https://github.com/nette/utils/actions)
@@ -11,25 +10,27 @@ Nette Utility Classes
 Introduction
 ------------
 
-In package nette/utils you will find a set of [useful classes](https://doc.nette.org/utils) for everyday use:
-
-- [Arrays](https://doc.nette.org/utils/arrays) - manipulate arrays
-- [Callback](https://doc.nette.org/utils/callback) - PHP callbacks
-- [Date and Time](https://doc.nette.org/utils/datetime) - modify times and dates
-- [Filesystem](https://doc.nette.org/utils/filesystem) - copying, renaming, …
-- [Finder](https://doc.nette.org/utils/finder) - finds files and directories
-- [Helper Functions](https://doc.nette.org/utils/helpers)
-- [HTML elements](https://doc.nette.org/utils/html-elements) - generate HTML
-- [Images](https://doc.nette.org/utils/images) - crop, resize, rotate images
-- [JSON](https://doc.nette.org/utils/json) - encoding and decoding
-- [Generating Random Strings](https://doc.nette.org/utils/random)
-- [Paginator](https://doc.nette.org/utils/paginator) - pagination math
-- [PHP Reflection](https://doc.nette.org/utils/reflection)
-- [Strings](https://doc.nette.org/utils/strings) - useful text functions
-- [SmartObject](https://doc.nette.org/utils/smartobject) - PHP object enhancements
-- [Validation](https://doc.nette.org/utils/validators) - validate inputs
-- [Type](https://doc.nette.org/utils/type) - PHP data type
-
+In package nette/utils you will find a set of useful classes for everyday use:
+
+✅ [Arrays](https://doc.nette.org/utils/arrays)<br>
+✅ [Callback](https://doc.nette.org/utils/callback) - PHP callbacks<br>
+✅ [Filesystem](https://doc.nette.org/utils/filesystem) - copying, renaming, …<br>
+✅ [Finder](https://doc.nette.org/utils/finder) - finds files and directories<br>
+✅ [Floats](https://doc.nette.org/utils/floats) - floating point numbers<br>
+✅ [Helper Functions](https://doc.nette.org/utils/helpers)<br>
+✅ [HTML elements](https://doc.nette.org/utils/html-elements) - generate HTML<br>
+✅ [Images](https://doc.nette.org/utils/images) - crop, resize, rotate images<br>
+✅ [Iterables](https://doc.nette.org/utils/iterables) <br>
+✅ [JSON](https://doc.nette.org/utils/json) - encoding and decoding<br>
+✅ [Generating Random Strings](https://doc.nette.org/utils/random)<br>
+✅ [Paginator](https://doc.nette.org/utils/paginator) - pagination math<br>
+✅ [PHP Reflection](https://doc.nette.org/utils/reflection)<br>
+✅ [Strings](https://doc.nette.org/utils/strings) - useful text functions<br>
+✅ [SmartObject](https://doc.nette.org/utils/smartobject) - PHP object enhancements<br>
+✅ [Type](https://doc.nette.org/utils/type) - PHP data type<br>
+✅ [Validation](https://doc.nette.org/utils/validators) - validate inputs<br>
+
+ <!---->
 
 Installation
 ------------
@@ -40,11 +41,9 @@ The recommended way to install is via Composer:
 composer require nette/utils
 ```
 
-- Nette Utils 4.0 is compatible with PHP 8.0 to 8.3
-- Nette Utils 3.2 is compatible with PHP 7.2 to 8.3
-- Nette Utils 3.1 is compatible with PHP 7.1 to 8.0
-- Nette Utils 3.0 is compatible with PHP 7.1 to 8.0
-- Nette Utils 2.5 is compatible with PHP 5.6 to 8.0
+Nette Utils 4.0 is compatible with PHP 8.0 to 8.4.
+
+ <!---->
 
 [Support Me](https://github.com/sponsors/dg)
 --------------------------------------------

package/vendor/nette/utils/src/Iterators/CachingIterator.php

@@ -31,26 +31,12 @@ class CachingIterator extends \CachingIterator implements \Countable
 	private int $counter = 0;
 
 
-	public function __construct($iterator)
+	public function __construct(iterable|\stdClass $iterable)
 	{
-		if (is_array($iterator) || $iterator instanceof \stdClass) {
-			$iterator = new \ArrayIterator($iterator);
-
-		} elseif ($iterator instanceof \IteratorAggregate) {
-			do {
-				$iterator = $iterator->getIterator();
-			} while ($iterator instanceof \IteratorAggregate);
-
-			assert($iterator instanceof \Iterator);
-
-		} elseif ($iterator instanceof \Iterator) {
-		} elseif ($iterator instanceof \Traversable) {
-			$iterator = new \IteratorIterator($iterator);
-		} else {
-			throw new Nette\InvalidArgumentException(sprintf('Invalid argument passed to %s; array or Traversable expected, %s given.', self::class, get_debug_type($iterator)));
-		}
-
-		parent::__construct($iterator, 0);
+		$iterable = $iterable instanceof \stdClass
+			? new \ArrayIterator($iterable)
+			: Nette\Utils\Iterables::toIterator($iterable);
+		parent::__construct($iterable, 0);
 	}
 
 

package/vendor/nette/utils/src/Iterators/Mapper.php

@@ -10,9 +10,8 @@ declare(strict_types=1);
 namespace Nette\Iterators;
 
 
-
 /**
- * Applies the callback to the elements of the inner iterator.
+ * @deprecated use Nette\Utils\Iterables::map()
  */
 class Mapper extends \IteratorIterator
 {

package/vendor/nette/utils/src/Utils/Arrays.php

@@ -122,10 +122,11 @@ class Arrays
 
 	/**
 	 * Returns the first item (matching the specified predicate if given). If there is no such item, it returns result of invoking $else or null.
-	 * The $predicate has the signature `function (mixed $value, int|string $key, array $array): bool`.
-	 * @template T
-	 * @param  array<T>  $array
-	 * @return ?T
+	 * @template K of int|string
+	 * @template V
+	 * @param  array<K, V>  $array
+	 * @param  ?callable(V, K, array<K, V>): bool  $predicate
+	 * @return ?V
 	 */
 	public static function first(array $array, ?callable $predicate = null, ?callable $else = null): mixed
 	{
@@ -138,10 +139,11 @@ class Arrays
 
 	/**
 	 * Returns the last item (matching the specified predicate if given). If there is no such item, it returns result of invoking $else or null.
-	 * The $predicate has the signature `function (mixed $value, int|string $key, array $array): bool`.
-	 * @template T
-	 * @param  array<T>  $array
-	 * @return ?T
+	 * @template K of int|string
+	 * @template V
+	 * @param  array<K, V>  $array
+	 * @param  ?callable(V, K, array<K, V>): bool  $predicate
+	 * @return ?V
 	 */
 	public static function last(array $array, ?callable $predicate = null, ?callable $else = null): mixed
 	{
@@ -154,7 +156,11 @@ class Arrays
 
 	/**
 	 * Returns the key of first item (matching the specified predicate if given) or null if there is no such item.
-	 * The $predicate has the signature `function (mixed $value, int|string $key, array $array): bool`.
+	 * @template K of int|string
+	 * @template V
+	 * @param  array<K, V>  $array
+	 * @param  ?callable(V, K, array<K, V>): bool  $predicate
+	 * @return ?K
 	 */
 	public static function firstKey(array $array, ?callable $predicate = null): int|string|null
 	{
@@ -172,7 +178,11 @@ class Arrays
 
 	/**
 	 * Returns the key of last item (matching the specified predicate if given) or null if there is no such item.
-	 * The $predicate has the signature `function (mixed $value, int|string $key, array $array): bool`.
+	 * @template K of int|string
+	 * @template V
+	 * @param  array<K, V>  $array
+	 * @param  ?callable(V, K, array<K, V>): bool  $predicate
+	 * @return ?K
 	 */
 	public static function lastKey(array $array, ?callable $predicate = null): int|string|null
 	{
@@ -267,7 +277,8 @@ class Arrays
 	 */
 	public static function isList(mixed $value): bool
 	{
-		return is_array($value) && (PHP_VERSION_ID < 80100
+		return is_array($value) && (
+			PHP_VERSION_ID < 80100
 			? !$value || array_keys($value) === range(0, count($value) - 1)
 			: array_is_list($value)
 		);
@@ -368,12 +379,11 @@ class Arrays
 
 
 	/**
-	 * Tests whether at least one element in the array passes the test implemented by the provided function,
-	 * which has the signature `function ($value, $key, array $array): bool`.
-	 * @template K
+	 * Tests whether at least one element in the array passes the test implemented by the provided function.
+	 * @template K of int|string
 	 * @template V
-	 * @param  iterable<K, V> $array
-	 * @param  callable(V, K, ($array is array ? array<K, V> : iterable<K, V>)): bool $predicate
+	 * @param  array<K, V>  $array
+	 * @param  callable(V, K, array<K, V>): bool  $predicate
 	 */
 	public static function some(iterable $array, callable $predicate): bool
 	{
@@ -388,12 +398,11 @@ class Arrays
 
 
 	/**
-	 * Tests whether all elements in the array pass the test implemented by the provided function,
-	 * which has the signature `function ($value, $key, array $array): bool`.
-	 * @template K
+	 * Tests whether all elements in the array pass the test implemented by the provided function.
+	 * @template K of int|string
 	 * @template V
-	 * @param  iterable<K, V> $array
-	 * @param  callable(V, K, ($array is array ? array<K, V> : iterable<K, V>)): bool $predicate
+	 * @param  array<K, V>  $array
+	 * @param  callable(V, K, array<K, V>): bool  $predicate
 	 */
 	public static function every(iterable $array, callable $predicate): bool
 	{
@@ -409,11 +418,10 @@ class Arrays
 
 	/**
 	 * Returns a new array containing all key-value pairs matching the given $predicate.
-	 * The callback has the signature `function (mixed $value, int|string $key, array $array): bool`.
-	 * @template K of array-key
+	 * @template K of int|string
 	 * @template V
-	 * @param  array<K, V> $array
-	 * @param  callable(V, K, array<K, V>): bool $predicate
+	 * @param  array<K, V>  $array
+	 * @param  callable(V, K, array<K, V>): bool  $predicate
 	 * @return array<K, V>
 	 */
 	public static function filter(array $array, callable $predicate): array
@@ -430,12 +438,11 @@ class Arrays
 
 	/**
 	 * Returns an array containing the original keys and results of applying the given transform function to each element.
-	 * The function has signature `function ($value, $key, array $array): mixed`.
-	 * @template K of array-key
+	 * @template K of int|string
 	 * @template V
 	 * @template R
-	 * @param  iterable<K, V> $array
-	 * @param  callable(V, K, ($array is array ? array<K, V> : iterable<K, V>)): R $transformer
+	 * @param  array<K, V>  $array
+	 * @param  callable(V, K, array<K, V>): R  $transformer
 	 * @return array<K, R>
 	 */
 	public static function map(iterable $array, callable $transformer): array
@@ -449,6 +456,31 @@ class Arrays
 	}
 
 
+	/**
+	 * Returns an array containing new keys and values generated by applying the given transform function to each element.
+	 * If the function returns null, the element is skipped.
+	 * @template K of int|string
+	 * @template V
+	 * @template ResK of int|string
+	 * @template ResV
+	 * @param  array<K, V>  $array
+	 * @param  callable(V, K, array<K, V>): ?array{ResK, ResV}  $transformer
+	 * @return array<ResK, ResV>
+	 */
+	public static function mapWithKeys(array $array, callable $transformer): array
+	{
+		$res = [];
+		foreach ($array as $k => $v) {
+			$pair = $transformer($v, $k, $array);
+			if ($pair) {
+				$res[$pair[0]] = $pair[1];
+			}
+		}
+
+		return $res;
+	}
+
+
 	/**
 	 * Invokes all callbacks and returns array of results.
 	 * @param  callable[]  $callbacks

package/vendor/nette/utils/src/Utils/Callback.php

@@ -94,7 +94,7 @@ final class Callback
 		}
 
 		if (is_string($callable) && str_contains($callable, '::')) {
-			return new ReflectionMethod($callable);
+			return new ReflectionMethod(...explode('::', $callable, 2));
 		} elseif (is_array($callable)) {
 			return new ReflectionMethod($callable[0], $callable[1]);
 		} elseif (is_object($callable) && !$callable instanceof \Closure) {

package/vendor/nette/utils/src/Utils/FileSystem.php

@@ -271,7 +271,7 @@ final class FileSystem
 	 */
 	public static function isAbsolute(string $path): bool
 	{
-		return (bool) preg_match('#([a-z]:)?[/\\\\]|[a-z][a-z0-9+.-]*://#Ai', $path);
+		return (bool) preg_match('#([a-z]:)?[/\\\]|[a-z][a-z0-9+.-]*://#Ai', $path);
 	}
 
 
@@ -280,7 +280,7 @@ final class FileSystem
 	 */
 	public static function normalizePath(string $path): string
 	{
-		$parts = $path === '' ? [] : preg_split('~[/\\\\]+~', $path);
+		$parts = $path === '' ? [] : preg_split('~[/\\\]+~', $path);
 		$res = [];
 		foreach ($parts as $part) {
 			if ($part === '..' && $res && end($res) !== '..' && end($res) !== '') {
@@ -305,6 +305,19 @@ final class FileSystem
 	}
 
 
+	/**
+	 * Resolves a path against a base path. If the path is absolute, returns it directly, if it's relative, joins it with the base path.
+	 */
+	public static function resolvePath(string $basePath, string $path): string
+	{
+		return match (true) {
+			self::isAbsolute($path) => self::platformSlashes($path),
+			$path === '' => self::platformSlashes($basePath),
+			default => self::joinPaths($basePath, $path),
+		};
+	}
+
+
 	/**
 	 * Converts backslashes to slashes.
 	 */