Skip to content

Commit 2301a42

Browse files
🐛 Fix iterator for file list
1 parent bd6a6e1 commit 2301a42

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

TwigCS/src/Config/Config.php

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,18 @@ public function findFiles(): array
3636
if (is_dir($path)) {
3737
$flags = \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS;
3838
$directoryIterator = new \RecursiveDirectoryIterator($path, $flags);
39-
} else {
40-
$directoryIterator = new \RecursiveArrayIterator([new \SplFileInfo($path)]);
41-
}
42-
43-
$filter = new TwigFileFilter($directoryIterator);
44-
$iterator = new \RecursiveIteratorIterator($filter);
45-
46-
/** @var \SplFileInfo $file */
47-
foreach ($iterator as $file) {
39+
$filter = new TwigFileFilter($directoryIterator);
40+
$iterator = new \RecursiveIteratorIterator($filter);
41+
42+
/** @var \SplFileInfo $file */
43+
foreach ($iterator as $k => $file) {
44+
$files[] = $file->getRealPath();
45+
}
46+
} elseif (is_file($path)) {
47+
$file = new \SplFileInfo($path);
4848
$files[] = $file->getRealPath();
49+
} else {
50+
throw new Exception(sprintf('Unknown path: "%s"', $path));
4951
}
5052
}
5153

TwigCS/src/Config/TwigFileFilter.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
*/
88
class TwigFileFilter extends \RecursiveFilterIterator
99
{
10-
/**
11-
* @param \RecursiveIterator $iterator
12-
*/
13-
public function __construct(\RecursiveIterator $iterator)
14-
{
15-
parent::__construct($iterator);
16-
}
17-
1810
/**
1911
* @return bool
2012
*/

0 commit comments

Comments
 (0)