fix(http): remove empty directories when running static:clean (#784)

Author: svenluijten

src/Tempest/Http/src/Static/StaticCleanCommand.php

@@ -4,10 +4,10 @@
 
 namespace Tempest\Http\Static;
 
+use FilesystemIterator;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use SplFileInfo;
-use Tempest\Console\Console;
 use Tempest\Console\ConsoleCommand;
 use Tempest\Console\HasConsole;
 use Tempest\Console\Middleware\CautionMiddleware;
@@ -19,7 +19,6 @@
     use HasConsole;
 
     public function __construct(
-        private Console $console,
         private Kernel $kernel,
     ) {
     }
@@ -29,12 +28,22 @@ public function __construct(
         middleware: [ForceMiddleware::class, CautionMiddleware::class]
     )]
     public function __invoke(): void
+    {
+
+        $directoryIterator = new RecursiveDirectoryIterator($this->kernel->root.'/public');
+        $directoryIterator->setFlags(FilesystemIterator::SKIP_DOTS);
+
+        $this->removeFiles($directoryIterator);
+        $this->removeEmptyDirectories($directoryIterator);
+
+        $this->success('Done');
+    }
+
+    private function removeFiles(RecursiveDirectoryIterator $directoryIterator): void
     {
         /** @var SplFileInfo[] $files */
         $files = [];
 
-        $directoryIterator = new RecursiveDirectoryIterator($this->kernel->root . '/public');
-
         /** @var SplFileInfo $file */
         foreach (new RecursiveIteratorIterator($directoryIterator) as $file) {
             if ($file->getExtension() === 'html') {
@@ -49,7 +58,25 @@ public function __invoke(): void
 
             $this->writeln("- <u>{$pathName}</u> removed");
         }
+    }
 
-        $this->success('Done');
+    private function removeEmptyDirectories(RecursiveDirectoryIterator $directoryIterator): void
+    {
+        /** @var SplFileInfo $file */
+        foreach (new RecursiveIteratorIterator($directoryIterator, RecursiveIteratorIterator::CHILD_FIRST) as $file) {
+            if (! $file->isDir()) {
+                continue;
+            }
+
+            if (count(glob($file->getPathname().'/*')) > 0) {
+                continue;
+            }
+
+            rmdir($file->getPathname());
+
+            $pathName = str_replace('\\', '/', $file->getPathname());
+
+            $this->writeln("- <u>{$pathName}</u> directory removed");
+        }
     }
 }

tests/Integration/Http/Static/StaticCleanCommandTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Integration\Http\Static;
+namespace Tests\Tempest\Integration\Http\Static;
 
 use Tempest\Core\AppConfig;
 use function Tempest\path;
@@ -29,5 +29,6 @@ public function test_generate(): void
 
         $this->assertFileDoesNotExist(path($root, '/public/static/a/b/index.html')->toString());
         $this->assertFileDoesNotExist(path($root, '/public/static/c/d/index.html')->toString());
+        $this->assertDirectoryDoesNotExist(path($root, '/public/static')->toString());
     }
 }