added Finder::and()

Author: dg

src/Utils/Finder.php

@@ -26,14 +26,19 @@ class Finder implements \IteratorAggregate
 {
 	use Nette\SmartObject;
 
-	private array $find = [];
-	private array $in = [];
-	private array $filters = [];
-	private array $recurseFilters = [];
+	/** @var FinderBatch[] */
+	private array $batches = [];
+	private FinderBatch $batch;
 	private bool $selfFirst = true;
 	private int $maxDepth = -1;
 
 
+	public function __construct()
+	{
+		$this->and();
+	}
+
+
 	/**
 	 * Begins search for files and directories matching mask.
 	 * @param  string  ...$masks
@@ -80,7 +85,7 @@ public function files(string ...$masks): static
 			if (str_starts_with($mask, '**/')) {
 				$mask = substr($mask, 3);
 			}
-			$this->find[] = [$mask, 'isFile'];
+			$this->batch->find[] = [$mask, 'isFile'];
 		}
 
 		return $this;
@@ -100,7 +105,7 @@ public function directories(string ...$masks): static
 			if (str_starts_with($mask, '**/')) {
 				$mask = substr($mask, 3);
 			}
-			$this->find[] = [$mask, 'isDir'];
+			$this->batch->find[] = [$mask, 'isDir'];
 		}
 
 		return $this;
@@ -119,7 +124,7 @@ public function in(...$paths): static
 				throw new Nette\InvalidArgumentException("Invalid directory '$path'");
 			}
 			$path = rtrim(self::normalizeSlashes($path), '/');
-			$this->in[] = $path;
+			$this->batch->in[] = $path;
 		}
 
 		return $this;
@@ -138,7 +143,7 @@ public function from(...$paths): static
 				throw new Nette\InvalidArgumentException("Invalid directory '$path'");
 			}
 			$path = rtrim(self::normalizeSlashes($path), '/');
-			$this->in[] = $path . '/**';
+			$this->batch->in[] = $path . '/**';
 		}
 
 		return $this;
@@ -155,6 +160,16 @@ public function childFirst(): static
 	}
 
 
+	/**
+	 * Starts defining a new search group.
+	 */
+	public function and(): static
+	{
+		$this->batches[] = $this->batch = new FinderBatch;
+		return $this;
+	}
+
+
 	/********************* filtering ****************d*g**/
 
 
@@ -185,14 +200,17 @@ public function exclude(...$masks): static
 	}
 
 
+	/********************* filtering ****************d*g**/
+
+
 	/**
 	 * Restricts the search using callback.
 	 * @param  callable(FileInfo): bool  $callback
 	 * @param  string  ...$masks
 	 */
 	public function filter(callable $callback): static
 	{
-		$this->filters[] = $callback;
+		$this->batch->filters[] = $callback;
 		return $this;
 	}
 
@@ -203,7 +221,7 @@ public function filter(callable $callback): static
 	 */
 	public function recurseFilter(callable $callback): static
 	{
-		$this->recurseFilters[] = $callback;
+		$this->batch->recurseFilters[] = $callback;
 		return $this;
 	}
 
@@ -304,7 +322,7 @@ private function traverseDir(string $dir, array $searches, array $subDirs = []):
 				foreach ($searches as $search) {
 					if (
 						$search->recursive
-						&& $this->invokeFilters($this->recurseFilters, $file, $cache)
+						&& $this->invokeFilters($search->batch->recurseFilters, $file, $cache)
 					) {
 						$into[] = $search;
 					}
@@ -320,7 +338,7 @@ private function traverseDir(string $dir, array $searches, array $subDirs = []):
 				if (
 					$file->{$search->mode}()
 					&& preg_match($search->find, $relativePathname)
-					&& $this->invokeFilters($this->filters, $file, $cache)
+					&& $this->invokeFilters($search->batch->filters, $file, $cache)
 				) {
 					yield $pathName => $file;
 					break;
@@ -351,17 +369,19 @@ private function invokeFilters(array $filters, FileInfo $file, array &$cache): b
 	private function prepare(): array
 	{
 		$groups = [];
-		foreach ($this->find as [$mask, $mode]) {
-			if (FileSystem::isAbsolute($mask)) {
-				if ($this->in) {
-					throw new Nette\InvalidStateException("You cannot combine the absolute path in the mask '$mask' and the directory to search '{$this->in[0]}'.");
-				}
-				[$base, $rest, $recursive] = self::splitRecursivePart($mask);
-				$groups[$base][] = (object) ['find' => $this->buildPattern($rest), 'mode' => $mode, 'recursive' => $recursive];
-			} else {
-				foreach ($this->in ?: ['.'] as $in) {
-					[$base, $rest, $recursive] = self::splitRecursivePart($in . '/' . $mask);
-					$groups[$base][] = (object) ['find' => $this->buildPattern($rest), 'mode' => $mode, 'recursive' => $recursive];
+		foreach ($this->batches as $batch) {
+			foreach ($batch->find as [$mask, $mode]) {
+				if (FileSystem::isAbsolute($mask)) {
+					if ($batch->in) {
+						throw new Nette\InvalidStateException("You cannot combine the absolute path in the mask '$mask' and the directory to search '{$batch->in[0]}'.");
+					}
+					[$base, $rest, $recursive] = self::splitRecursivePart($mask);
+					$groups[$base][] = (object) ['find' => $this->buildPattern($rest), 'mode' => $mode, 'recursive' => $recursive, 'batch' => $batch];
+				} else {
+					foreach ($batch->in ?: ['.'] as $in) {
+						[$base, $rest, $recursive] = self::splitRecursivePart($in . '/' . $mask);
+						$groups[$base][] = (object) ['find' => $this->buildPattern($rest), 'mode' => $mode, 'recursive' => $recursive, 'batch' => $batch];
+					}
 				}
 			}
 		}

src/Utils/FinderBatch.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\Utils;
+
+use Nette;
+
+
+/** @internal */
+final class FinderBatch
+{
+	use Nette\SmartObject;
+
+	public array $find = [];
+	public array $in = [];
+	public array $filters = [];
+	public array $recurseFilters = [];
+}

tests/Utils/Finder.and.phpt

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Test: Nette\Utils\Finder multiple batches.
+ */
+
+declare(strict_types=1);
+
+use Nette\Utils\Finder;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+function export($iterator)
+{
+	$arr = [];
+	foreach ($iterator as $key => $value) {
+		$arr[] = strtr($key, '\\', '/');
+	}
+
+	sort($arr);
+	return $arr;
+}
+
+
+test('and', function () {
+	$finder = Finder::findFiles('file.txt')
+		->in('files')
+		->and()
+		->directories('subdir*')->from('files')
+		->and()
+		->files('file.txt')->from('files/*/subdir*');
+
+	Assert::same([
+		'files/file.txt',
+		'files/subdir',
+		'files/subdir/subdir2',
+		'files/subdir/subdir2/file.txt',
+	], export($finder));
+});