Merge pull request #788 from camilstaps/fix-391-directory-structure-i…

…s-ignored Fix #391: directory structure is ignored
klaussilveira · Jun 9, 2018 · ec6211e · ec6211e
2 parents eab6bc0 + 51edf30
commit ec6211e
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/Git/Client.php b/src/Git/Client.php
@@ -157,7 +157,7 @@ protected function setProjects($projects)
         return $this;
     }
 
-    private function recurseDirectory($path, $topLevel = true)
+    private function recurseDirectory($path, $appendPath = '')
     {
         $dir = new \DirectoryIterator($path);
 
@@ -209,11 +209,7 @@ private function recurseDirectory($path, $topLevel = true)
                         $description = null;
                     }
 
-                    if (!$topLevel) {
-                        $repoName = $file->getPathInfo()->getFilename() . '/' . $file->getFilename();
-                    } else {
-                        $repoName = $file->getFilename();
-                    }
+                    $repoName = $appendPath . $file->getFilename();
 
                     if (is_array($this->getProjects()) && !in_array($repoName, $this->getProjects())) {
                         continue;
@@ -227,7 +223,7 @@ private function recurseDirectory($path, $topLevel = true)
 
                     continue;
                 }
-                $repositories = array_merge($repositories, $this->recurseDirectory($file->getPathname(), false));
+                $repositories = array_merge($repositories, $this->recurseDirectory($file->getPathname(), $appendPath . $file->getFilename() . '/'));
             }
         }