[6.x] Forms 2: Temporary file upload fixes

src/Forms/Email.php

@@ -5,6 +5,7 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
 use Statamic\Contracts\Forms\Submission;
 use Statamic\Facades\Antlers;
 use Statamic\Facades\Blueprint;
@@ -161,7 +162,9 @@ private function attachFiles($field)
             : config('statamic.system.file_uploads_path', 'statamic/file-uploads');
 
         foreach ($value as $file) {
-            $this->attachFromStorageDisk($disk, $basePath.'/'.$file);
+            if (Storage::disk($disk)->exists($path = "{$basePath}/{$file}")) {
+                $this->attachFromStorageDisk($disk, $path);
+            }
         }
     }
 

src/Forms/Submission.php

@@ -292,6 +292,10 @@ public function delete()
         $withEvents = $this->withEvents;
         $this->withEvents = true;
 
+        if ($withEvents) {
+            DeleteTemporaryFiles::dispatchSync($this);
+        }
+
         FormSubmission::delete($this);
 
         if ($withEvents) {

src/Jobs/DeletePartialFormSubmissions.php

@@ -6,9 +6,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Statamic\Contracts\Forms\Submission;
 use Statamic\Facades\FormSubmission;
-use Statamic\Forms\DeleteTemporaryFiles;
 
 class DeletePartialFormSubmissions implements ShouldQueue
 {
@@ -26,10 +24,6 @@ public function handle(): void
             ->where('partial', true)
             ->where('date', '<', $threshold)
             ->get()
-            ->each(function (Submission $submission): void {
-                DeleteTemporaryFiles::dispatchSync($submission);
-
-                $submission->delete();
-            });
+            ->each->delete();
     }
 }

tests/Forms/EmailTest.php

@@ -351,6 +351,24 @@ public function it_attaches_files_from_files_field()
         $this->assertTrue($email->hasAttachmentFromStorageDisk('local', 'statamic/file-uploads/'.$documentPath));
     }
 
+    #[Test]
+    public function it_skips_attachments_whose_temporary_files_no_longer_exist()
+    {
+        Storage::fake('local');
+
+        $form = tap(Form::make('test')->formFields([
+            'fields' => [
+                ['handle' => 'document', 'field' => ['type' => 'files', 'max_files' => 1]],
+            ],
+        ]))->save();
+
+        $submission = $form->makeSubmission()->data(['document' => now()->timestamp.'/resume.pdf']);
+
+        $email = tap(new Email($submission, ['to' => 'test@test.com', 'attachments' => true], Site::default()))->build();
+
+        $this->assertEmpty($email->attachments);
+    }
+
     #[Test]
     public function it_attaches_files_from_files_field_on_the_configured_disk_and_path()
     {

tests/Forms/SubmissionTest.php

@@ -17,6 +17,7 @@
 use Statamic\Facades\Form;
 use Statamic\Facades\Site;
 use Statamic\Forms\CreateAssetsFromFileUploads;
+use Statamic\Forms\DeleteTemporaryFiles;
 use Statamic\Forms\SendEmails;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -272,6 +273,32 @@ public function it_deletes_quietly()
         $this->assertTrue($return);
     }
 
+    #[Test]
+    public function deleting_dispatches_delete_temporary_files()
+    {
+        Bus::fake();
+
+        $form = tap(Form::make('contact_us'))->save();
+        $submission = tap($form->makeSubmission())->save();
+
+        $submission->delete();
+
+        Bus::assertDispatchedSync(DeleteTemporaryFiles::class);
+    }
+
+    #[Test]
+    public function deleting_quietly_does_not_dispatch_delete_temporary_files()
+    {
+        Bus::fake();
+
+        $form = tap(Form::make('contact_us'))->save();
+        $submission = tap($form->makeSubmission())->save();
+
+        $submission->deleteQuietly();
+
+        Bus::assertNotDispatched(DeleteTemporaryFiles::class);
+    }
+
     #[Test]
     public function it_determines_its_status()
     {