Finder: collect() returns list

nette · Jul 30, 2023 · 8d80a2d · 8d80a2d
1 parent 0ce0601
commit 8d80a2d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Utils/Finder.php b/src/Utils/Finder.php
@@ -309,10 +309,11 @@ public function date(string $operator, string|int|\DateTimeInterface|null $date
 
 	/**
 	 * Returns an array with all found files and directories.
+	 * @return list<FileInfo>
 	 */
 	public function collect(): array
 	{
-		return iterator_to_array($this->getIterator());
+		return iterator_to_array($this->getIterator(), preserve_keys: false);
 	}
 
 

diff --git a/tests/Utils/Finder.append.phpt b/tests/Utils/Finder.append.phpt
@@ -31,7 +31,7 @@ test('append finder', function () {
 		"fixtures.finder{$ds}subdir",
 		"fixtures.finder{$ds}subdir{$ds}subdir2",
 		"fixtures.finder{$ds}subdir{$ds}subdir2{$ds}file.txt",
-	], array_keys($finder->collect()));
+	], array_map('strval', $finder->collect()));
 });
 
 test('append files', function () {
@@ -40,7 +40,7 @@ test('append files', function () {
 		->append(FileSystem::unixSlashes(__DIR__));
 
 	Assert::equal([
-		__FILE__ => new Nette\Utils\FileInfo(__FILE__),
-		__DIR__ => new Nette\Utils\FileInfo(__DIR__),
+		new Nette\Utils\FileInfo(__FILE__),
+		new Nette\Utils\FileInfo(__DIR__),
 	], $finder->collect());
 });
diff --git a/tests/Utils/Finder.fileInfo.phpt b/tests/Utils/Finder.fileInfo.phpt
@@ -20,7 +20,7 @@ test('absolute path', function () {
 		->collect();
 
 	Assert::equal(
-		[__FILE__ => new FileInfo(__FILE__)],
+		[new FileInfo(__FILE__)],
 		$files,
 	);
 
@@ -36,7 +36,6 @@ test('relative path', function () {
 		->from('fixtures.finder')
 		->collect();
 
-	$files = array_values($files);
 	$ds = DIRECTORY_SEPARATOR;
 	Assert::same('subdir', $files[0]->getRelativePath());
 	Assert::same("subdir{$ds}readme", $files[0]->getRelativePathname());