normalized callable to Closure

Author: dg

src/Iterators/Mapper.php

@@ -15,14 +15,13 @@
  */
 class Mapper extends \IteratorIterator
 {
-	/** @var callable */
-	private $callback;
+	private \Closure $callback;
 
 
 	public function __construct(\Traversable $iterator, callable $callback)
 	{
 		parent::__construct($iterator);
-		$this->callback = $callback;
+		$this->callback = $callback(...);
 	}
 
 

src/Utils/Finder.php

@@ -42,8 +42,8 @@ class Finder implements \IteratorAggregate
 	private array $appends = [];
 	private bool $childFirst = false;
 
-	/** @var ?callable */
-	private $sort;
+	/** @var ?(\Closure(FileInfo, FileInfo): int) */
+	private ?\Closure $sort = null;
 	private int $maxDepth = -1;
 	private bool $ignoreUnreadableDirs = true;
 
@@ -184,7 +184,7 @@ public function ignoreUnreadableDirs(bool $state = true): static
 	 */
 	public function sortBy(callable $callback): static
 	{
-		$this->sort = $callback;
+		$this->sort = $callback(...);
 		return $this;
 	}
 
@@ -250,7 +250,7 @@ public function exclude(string|array $masks): static
 	 */
 	public function filter(callable $callback): static
 	{
-		$this->filters[] = \Closure::fromCallable($callback);
+		$this->filters[] = $callback(...);
 		return $this;
 	}
 
@@ -261,7 +261,7 @@ public function filter(callable $callback): static
 	 */
 	public function descentFilter(callable $callback): static
 	{
-		$this->descentFilters[] = \Closure::fromCallable($callback);
+		$this->descentFilters[] = $callback(...);
 		return $this;
 	}
 

src/Utils/Iterables.php

@@ -194,9 +194,10 @@ public static function mapWithKeys(iterable $iterable, callable $transformer): \
 	 */
 	public static function repeatable(callable $factory): \IteratorAggregate
 	{
-		return new class ($factory) implements \IteratorAggregate {
+		return new class ($factory(...)) implements \IteratorAggregate {
 			public function __construct(
-				private $factory,
+				/** @var \Closure(): iterable<mixed, mixed> */
+				private \Closure $factory,
 			) {
 			}