Merge pull request #30 from ernix/cleanup-dirs

Fix cleanup code in `src/Workspaces/Concerns/CompilesWorkspace.php`
Stillat · Mar 4, 2024 · 4cb4888 · 4cb4888
2 parents fc42f29 + ef947cd
commit 4cb4888
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/Workspaces/Concerns/CompilesWorkspace.php b/src/Workspaces/Concerns/CompilesWorkspace.php
@@ -22,6 +22,13 @@ trait CompilesWorkspace
      */
     protected array $compiledFiles = [];
 
+    /**
+     * A list of all directories created by the workspace compiler.
+     *
+     * @var string[]
+     */
+    protected array $createdDirs = [];
+
     /**
      * The path to the last temporary directory used.
      *
@@ -81,6 +88,10 @@ public function removeCompiledFiles(): Workspace
             @unlink($compiledPath);
         }
 
+        foreach ($this->createdDirs as $dir) {
+            @rmdir($dir);
+        }
+
         return $this;
     }
 
@@ -137,7 +148,6 @@ public function compile(string $outputDirectory): void
     {
         $outputDirectory = Paths::normalizePathWithTrailingSlash($outputDirectory);
         $this->lastTempDirectory = $outputDirectory;
-        $createdDirs = [];
 
         try {
             /** @var Document $doc */
@@ -153,21 +163,18 @@ public function compile(string $outputDirectory): void
                 };
                 $result = $doc->compile($options);
 
-                $dir = Paths::normalizePathWithTrailingSlash(Str::afterLast(Paths::normalizePath($compilePath), '/'));
-                $createdDirs[] = $dir;
+                $dir = Paths::normalizePathWithTrailingSlash(dirname(Paths::normalizePath($compilePath)));
 
                 if (! file_exists($dir)) {
                     @mkdir($dir, 0755, true);
+                    $this->createdDirs[] = $dir;
                 }
 
                 file_put_contents($compilePath, $result);
                 $this->compiledFiles[$compilePath] = $doc->getFilePath();
                 $this->compiledDocuments[$compilePath] = $doc;
             }
         } catch (Exception $e) {
-            foreach ($createdDirs as $dir) {
-                @rmdir($dir);
-            }
             $this->removeCompiledFiles();
 
             throw $e;