Match laravel repos within a subdirectory

composer.json

@@ -13,9 +13,10 @@
         }
     ],
     "require": {
-        "php": "^7.1|^8.0",
+        "php": "^7.3|^8.0",
         "symfony/console": "^3.0|^4.0|^5.0",
         "symfony/filesystem": "^3.0|^4.0|^5.0",
+        "symfony/finder": "^3.0|^4.0|^5.0",
         "czproject/git-php": "^4.0"
     },
     "require-dev": {

src/Directory.php

@@ -4,6 +4,7 @@
 
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
+use Symfony\Component\Finder\Finder;
 
 class Directory
 {
@@ -31,15 +32,9 @@ public function getPath(string $file = null): string
         return $this->path;
     }
 
-    public function find(string $file): ?string
+    public function find(): Finder
     {
-        $files = glob($this->getPath($file));
-
-        if (count($files) > 0 && $this->fs->exists($files[0])) {
-            return $files[0];
-        }
-
-        return null;
+        return (new Finder())->in($this->getPath());
     }
 
     public function contains(string $file): bool

src/Drivers/LaravelDriver.php

@@ -2,11 +2,18 @@
 
 namespace Autopilot\Drivers;
 
+use Symfony\Component\Filesystem\Filesystem;
+
 class LaravelDriver extends Driver
 {
     public function matches(): bool
     {
-        return $this->repository->dir()->contains('artisan');
+        if ($this->repository->dir()->contains('artisan')) {
+            return true;
+        }
+
+        // @todo maybe all drivers should attempt subdirectories
+        return $this->attemptMatchInSubdirectory();
     }
 
     public function setUp(): Driver
@@ -78,4 +85,29 @@ private function generateAppKey(): void
 
         passthru("php {$artisan} key:generate");
     }
+
+    private function attemptMatchInSubdirectory(): bool
+    {
+        $finder = $this->repository->dir()->find()
+            ->depth(1)
+            ->name('artisan');
+
+        if ($finder->count() === 0) {
+            return false;
+        }
+
+        $file = array_values(iterator_to_array($finder))[0];
+        $this->moveSubdirectoryToRoot($file->getPath());
+
+        return true;
+    }
+
+    private function moveSubdirectoryToRoot(string $subdirectory)
+    {
+        $fs = new Filesystem();
+
+        $dir = $this->repository->dir();
+        $fs->rename($subdirectory, $dir->getPath('../temp'), true);
+        $fs->rename($dir->getPath('../temp'), $dir->getPath('../repository'), true);
+    }
 }

src/Drivers/PhpWebDriver.php

@@ -6,7 +6,7 @@ class PhpWebDriver extends Driver
 {
     public function matches(): bool
     {
-        return $this->repository->dir()->find('*.php') !== null;
+        return $this->repository->dir()->find()->name('*.php')->count() > 0;
     }
 
     public function setUp(): Driver
@@ -21,12 +21,12 @@ public function serve(): Driver
         return $this;
     }
 
-    private function getPrimaryFile(): string
-    {
-        if ($index = $this->repository->dir()->find('index.php')) {
-            return $index;
-        }
-
-        return $this->repository->dir()->find('*.php');
-    }
+    //private function getPrimaryFile(): string
+    //{
+    //    if ($index = $this->repository->dir()->find('index.php')) {
+    //        return $index;
+    //    }
+    //
+    //    return $this->repository->dir()->find('*.php');
+    //}
 }

src/Repository.php

@@ -3,7 +3,6 @@
 namespace Autopilot;
 
 use CzProject\GitPhp\Git;
-use Symfony\Component\Filesystem\Filesystem;
 
 class Repository
 {

tests/Drivers/LaravelDriverTest.php

@@ -17,6 +17,17 @@ public function it_matches_default_laravel_project()
         $this->assertTrue($driver->matches());
     }
 
+    /** @test */
+    public function it_matches_laravel_project_in_subdirectory()
+    {
+        $repository = new Repository("[email protected]:221b9169-0a37-11ec-a943-4213e7ee7fac/d2a8bcaa-0a37-11ec-a943-4213e7ee7fac/Modelling-Is-Paramount-25a726e6-4a9f49dc.git");
+        $repository->clone();
+
+        $driver = new LaravelDriver($repository);
+
+        $this->assertTrue($driver->matches());
+    }
+
     /** @test */
     public function it_sets_up_laravel_application()
     {