added Finder::append()

Author: dg

src/Utils/Finder.php

@@ -37,6 +37,9 @@ class Finder implements \IteratorAggregate
 
 	/** @var \Closure[] */
 	private array $descentFilters = [];
+
+	/** @var array<string|self> */
+	private array $appends = [];
 	private bool $childFirst = false;
 
 	/** @var ?callable */
@@ -187,6 +190,20 @@ public function sortByName(): static
 	}
 
 
+	/**
+	 * Adds the specified paths or appends a new finder that returns.
+	 */
+	public function append(string|array|null $paths = null): static
+	{
+		if ($paths === null) {
+			return $this->appends[] = new static;
+		}
+
+		$this->appends = array_merge($this->appends, (array) $paths);
+		return $this;
+	}
+
+
 	/********************* filtering ****************d*g**/
 
 
@@ -306,6 +323,15 @@ public function getIterator(): \Generator
 		foreach ($plan as $dir => $searches) {
 			yield from $this->traverseDir($dir, $searches);
 		}
+
+		foreach ($this->appends as $item) {
+			if ($item instanceof self) {
+				yield from $item->getIterator();
+			} else {
+				$item = FileSystem::platformSlashes($item);
+				yield $item => new FileInfo($item);
+			}
+		}
 	}
 
 

tests/Utils/Finder.append.phpt

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Test: Nette\Utils\Finder append.
+ */
+
+declare(strict_types=1);
+
+use Nette\Utils\FileSystem;
+use Nette\Utils\Finder;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('append finder', function () {
+	($finder = new Finder)
+		->files('file.txt')
+		->in('fixtures.finder')
+		->append()
+		->directories('subdir*')
+		->from('fixtures.finder')
+		->append()
+		->files('file.txt')
+		->from('fixtures.finder/*/subdir*');
+
+	$ds = DIRECTORY_SEPARATOR;
+	Assert::same([
+		"fixtures.finder{$ds}file.txt",
+		"fixtures.finder{$ds}subdir",
+		"fixtures.finder{$ds}subdir{$ds}subdir2",
+		"fixtures.finder{$ds}subdir{$ds}subdir2{$ds}file.txt",
+	], array_keys($finder->collect()));
+});
+
+test('append files', function () {
+	($finder = new Finder)
+		->append(__FILE__)
+		->append(FileSystem::unixSlashes(__DIR__));
+
+	Assert::equal([
+		__FILE__ => new Nette\Utils\FileInfo(__FILE__),
+		__DIR__ => new Nette\Utils\FileInfo(__DIR__),
+	], $finder->collect());
+});