Merge pull request #118 from VincentLanglet/fixIterator

🐛 Fix iterator for file list
VincentLanglet · Feb 19, 2020 · ea7505a · ea7505a
2 parents bd6a6e1 + 2301a42
commit ea7505a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/TwigCS/src/Config/Config.php b/TwigCS/src/Config/Config.php
@@ -36,16 +36,18 @@ public function findFiles(): array
             if (is_dir($path)) {
                 $flags = \RecursiveDirectoryIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS;
                 $directoryIterator = new \RecursiveDirectoryIterator($path, $flags);
-            } else {
-                $directoryIterator = new \RecursiveArrayIterator([new \SplFileInfo($path)]);
-            }
-
-            $filter = new TwigFileFilter($directoryIterator);
-            $iterator = new \RecursiveIteratorIterator($filter);
-
-            /** @var \SplFileInfo $file */
-            foreach ($iterator as $file) {
+                $filter = new TwigFileFilter($directoryIterator);
+                $iterator = new \RecursiveIteratorIterator($filter);
+
+                /** @var \SplFileInfo $file */
+                foreach ($iterator as $k => $file) {
+                    $files[] = $file->getRealPath();
+                }
+            } elseif (is_file($path)) {
+                $file = new \SplFileInfo($path);
                 $files[] = $file->getRealPath();
+            } else {
+                throw new Exception(sprintf('Unknown path: "%s"', $path));
             }
         }
 

diff --git a/TwigCS/src/Config/TwigFileFilter.php b/TwigCS/src/Config/TwigFileFilter.php
@@ -7,14 +7,6 @@
  */
 class TwigFileFilter extends \RecursiveFilterIterator
 {
-    /**
-     * @param \RecursiveIterator $iterator
-     */
-    public function __construct(\RecursiveIterator $iterator)
-    {
-        parent::__construct($iterator);
-    }
-
     /**
      * @return bool
      */