normalized callable to Closure

Author: dg

src/Latte/Compiler/TemplateParser.php

@@ -42,7 +42,7 @@ final class TemplateParser
 	private string $contentType;
 	private int $counter = 0;
 	private ?Tag $tag = null;
-	private $lastResolver;
+	private ?\Closure $lastResolver = null;
 	private \WeakMap $lookFor;
 
 
@@ -83,11 +83,15 @@ public function parse(string $template): Nodes\TemplateNode
 	}
 
 
-	public function parseFragment(callable $resolver, ?callable $after = null): FragmentNode
+	/**
+	 * @param  \Closure(FragmentNode): ?Node  $resolver
+	 * @param  (\Closure(FragmentNode): void)|null  $after
+	 */
+	public function parseFragment(\Closure $resolver, ?\Closure $after = null): FragmentNode
 	{
 		$res = new FragmentNode;
 		$save = [$this->lastResolver, $this->tag];
-		$this->lastResolver = $resolver;
+		$this->lastResolver = $resolver(...);
 		try {
 			while (!$this->stream->peek()->isEnd()) {
 				if ($node = $resolver($res)) {

src/Latte/Engine.php

@@ -428,7 +428,7 @@ public function getPolicy(bool $effective = false): ?Policy
 
 	public function setExceptionHandler(callable $handler): static
 	{
-		$this->providers->coreExceptionHandler = $handler;
+		$this->providers->coreExceptionHandler = $handler(...);
 		return $this;
 	}
 

src/Latte/Essential/TranslatorExtension.php

@@ -25,18 +25,18 @@
  */
 final class TranslatorExtension extends Latte\Extension
 {
-	/** @var callable|Translator|null */
-	private $translator;
+	private ?\Closure $translator;
 
 
 	public function __construct(
 		callable|Translator|null $translator,
 		private ?string $key = null,
 	) {
-		$this->translator = $translator;
-		if ($translator instanceof Translator) {
-			$this->translator = $translator->translate(...);
-		}
+		$this->translator = match (true) {
+			$translator === null => null,
+			$translator instanceof Translator => $translator->translate(...),
+			default => $translator(...),
+		};
 	}
 
 

src/Latte/Extension.php

@@ -94,6 +94,7 @@ public function beforeRender(Runtime\Template $template): void
 
 	public static function order(callable $subject, array|string $before = [], array|string $after = []): \stdClass
 	{
+		$subject = $subject(...);
 		return (object) get_defined_vars();
 	}
 }

src/Latte/Sandbox/RuntimeChecker.php

@@ -53,7 +53,7 @@ public function callMethod(mixed $object, mixed $method, array $args, bool $null
 	public function closure(mixed $callable): \Closure
 	{
 		self::checkCallable($callable);
-		return \Closure::fromCallable($callable);
+		return $callable(...);
 	}