Fix intermittent mkdir race when generating with multiple workers

src/Commands/StaticSiteServe.php

@@ -33,7 +33,7 @@ class StaticSiteServe extends Command
     /**
      * The list of requests being handled and their start time.
      *
-     * @var array<int, \Illuminate\Support\Carbon>
+     * @var array<int, Carbon>
      */
     protected $requestsPool;
 
@@ -68,7 +68,7 @@ public function handle()
      * Start a new server process.
      *
      * @param  bool  $hasEnvironment
-     * @return \Symfony\Component\Process\Process
+     * @return Process
      */
     protected function startProcess()
     {
@@ -208,7 +208,7 @@ protected function handleProcessOutput()
      * Get the date from the given PHP server output.
      *
      * @param  string  $line
-     * @return \Illuminate\Support\Carbon
+     * @return Carbon
      */
     protected function getDateFromLine($line)
     {

src/Page.php

@@ -65,7 +65,9 @@ protected function write($request)
         $html = $response->getContent();
 
         if (! $this->files->exists($this->directory())) {
-            $this->files->makeDirectory($this->directory(), 0755, true);
+            // Force the creation, since when running with multiple workers,
+            // another worker may have created the directory in the meantime.
+            $this->files->makeDirectory($this->directory(), 0755, true, true);
         }
 
         $this->files->put($this->path(), $html);

tests/PageTest.php

@@ -3,6 +3,8 @@
 namespace Tests;
 
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Contracts\Entries\Entry;
 use Statamic\StaticSite\Page;
@@ -45,6 +47,34 @@ public function it_gets_the_path_of_the_404_url()
         $this->assertEquals('/path/to/static', $page->directory());
     }
 
+    #[Test]
+    public function it_writes_when_another_worker_creates_the_directory_after_the_existence_check()
+    {
+        // Simulate the race between parallel workers, where the directory doesn't
+        // exist when checked but has appeared by the time mkdir runs.
+        $files = new class extends Filesystem
+        {
+            public function exists($path)
+            {
+                return false;
+            }
+        };
+
+        $destination = base_path('static');
+        $files->deleteDirectory($destination);
+        $files->makeDirectory($destination.'/foo/bar', 0755, true);
+
+        $entry = $this->mock(Entry::class);
+        $entry->shouldReceive('urlWithoutRedirect')->andReturn('/foo/bar');
+        $entry->shouldReceive('toResponse')->andReturn(new Response('html'));
+
+        $page = new Page($files, ['destination' => $destination], $entry);
+
+        $page->generate(Request::create('/foo/bar'));
+
+        $this->assertFileExists($destination.'/foo/bar/index.html');
+    }
+
     private function page($entry, $config)
     {
         return new Page($this->mock(Filesystem::class), $config, $entry);

tests/TestCase.php

@@ -4,7 +4,9 @@
 
 use Illuminate\Filesystem\Filesystem;
 use Orchestra\Testbench\TestCase as OrchestraTestCase;
+use Statamic\Providers\StatamicServiceProvider;
 use Statamic\Statamic;
+use Wilderborn\Partyline\ServiceProvider;
 
 class TestCase extends OrchestraTestCase
 {
@@ -14,8 +16,8 @@ class TestCase extends OrchestraTestCase
     protected function getPackageProviders($app)
     {
         return [
-            \Statamic\Providers\StatamicServiceProvider::class,
-            \Wilderborn\Partyline\ServiceProvider::class,
+            StatamicServiceProvider::class,
+            ServiceProvider::class,
             \Statamic\StaticSite\ServiceProvider::class,
         ];
     }