Finder: Fix symlink handling

src/Utils/Finder.php

@@ -382,7 +382,10 @@ private function traverseDir(string $dir, array $searches, array $subdirs = []):
 			$relativePathname = FileSystem::unixSlashes($file->getRelativePathname());
 			foreach ($searches as $search) {
 				if (
-					$file->getType() === $search->mode
+					(
+						$file->getType() === $search->mode
+						|| ($file->getType() === 'link' && in_array($search->mode, ['file', 'dir'], true))
+					)
 					&& preg_match($search->pattern, $relativePathname)
 					&& $this->proveFilters($this->filters, $file, $cache)
 				) {

tests/Utils/Finder.basic.phpt

@@ -28,7 +28,7 @@ function export($iterator, bool $sort = true)
 }
 
 
-test('expty search', function () {
+test('empty search', function () {
 	$finder = (new Finder)->in('fixtures.finder');
 	Assert::same([], export($finder));
 
@@ -172,3 +172,24 @@ test('absolute path in mask', function () { // will not work if there are charac
 		FileSystem::unixSlashes(__DIR__),
 	], export($finder));
 });
+
+test('symlink to file', function() {
+	$finder = Finder::find('subdir/*.txt')->in('fixtures.finder3');
+	Assert::same([
+		'fixtures.finder3/subdir/file.txt',
+	], export($finder));
+});
+
+test('symlink to directory', function() {
+	$finder = Finder::findDirectories()->in('fixtures.finder3/another_subdir');
+	Assert::same([
+		'fixtures.finder3/another_subdir/subdir',
+	], export($finder));
+});
+
+test('symlink to file in symlinked directory', function() {
+	$finder = Finder::find('subdir/*.txt')->in('fixtures.finder3/another_subdir');
+	Assert::same([
+		'fixtures.finder3/another_subdir/subdir/file.txt',
+	], export($finder));
+});

tests/Utils/fixtures.finder3/another_subdir/subdir

@@ -0,0 +1 @@
+../subdir

tests/Utils/fixtures.finder3/file.txt

@@ -0,0 +1 @@
+File for testing purposes

tests/Utils/fixtures.finder3/subdir/file.txt

@@ -0,0 +1 @@
+../file.txt