Prevented infinite recursion in getAllFiles() #48

hiqdev · Jan 17, 2020 · 0ebcdea · 0ebcdea
1 parent 3fd5c38
commit 0ebcdea
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -145,15 +145,17 @@ protected function reorderFiles(): void
         }
     }
 
-    protected function getAllFiles(string $name): array
+    protected function getAllFiles(string $name, array $stack = []): array
     {
         if (empty($this->files[$name])) {
             return[];
         }
         $res = [];
         foreach ($this->files[$name] as $file) {
             if (strncmp($file, '$', 1) === 0) {
-                $res = array_merge($res, $this->getAllFiles(substr($file, 1)));
+                if (!in_array($name, $stack, true)) {
+                    $res = array_merge($res, $this->getAllFiles(substr($file, 1), array_merge($stack, [$name])));
+                }
             } else {
                 $res[] = $file;
             }