Bring FormSubmission save/delete inline with core (#419)

* Bring FormSubmission save/delete inline with core

* tests

Author: ryanmitchell

src/Forms/Submission.php

@@ -76,16 +76,29 @@ public function save()
             return false;
         }
 
+        $withEvents = $this->withEvents;
+        $this->withEvents = true;
+
+        $afterSaveCallbacks = $this->afterSaveCallbacks;
+        $this->afterSaveCallbacks = [];
+
         $model = $this->toModel();
         $model->save();
         $isNew = $model->wasRecentlyCreated;
 
         $this->model($model->fresh());
 
-        if ($isNew) {
-            SubmissionCreated::dispatch($this);
+        foreach ($afterSaveCallbacks as $callback) {
+            $callback($this);
+        }
+
+        if ($withEvents) {
+            if ($isNew) {
+                SubmissionCreated::dispatch($this);
+            }
+
+            SubmissionSaved::dispatch($this);
         }
-        SubmissionSaved::dispatch($this);
     }
 
     public function delete()
@@ -95,8 +108,15 @@ public function delete()
             $this->model = $class::findOrNew($this->id);
         }
 
+        $withEvents = $this->withEvents;
+        $this->withEvents = true;
+
         $this->model->delete();
 
-        SubmissionDeleted::dispatch($this);
+        if ($withEvents) {
+            SubmissionDeleted::dispatch($this);
+        }
+
+        return true;
     }
 }

tests/Forms/FormSubmissionTest.php

@@ -3,9 +3,13 @@
 namespace Tests\Forms;
 
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Event;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Eloquent\Forms\FormModel;
 use Statamic\Eloquent\Forms\SubmissionModel;
+use Statamic\Events\SubmissionCreated;
+use Statamic\Events\SubmissionDeleted;
+use Statamic\Events\SubmissionSaved;
 use Statamic\Facades;
 use Tests\TestCase;
 
@@ -115,4 +119,54 @@ public function null_values_are_removed_from_data()
 
         $this->assertArrayNotHasKey('null_value', $submission->model()->data);
     }
+
+    #[Test]
+    public function it_should_save_quietly()
+    {
+        $form = tap(Facades\Form::make('test')->title('Test'))
+            ->save();
+
+        Event::fake();
+
+        tap($form->makeSubmission([
+            'name' => 'John Doe',
+        ]))->saveQuietly();
+
+        Event::assertNotDispatched(SubmissionSaved::class);
+        Event::assertNotDispatched(SubmissionCreated::class);
+
+        tap($form->makeSubmission([
+            'name' => 'John Doe',
+        ]))->save();
+
+        Event::assertDispatched(SubmissionSaved::class);
+        Event::assertDispatched(SubmissionCreated::class);
+    }
+
+    #[Test]
+    public function it_should_delete_quietly()
+    {
+        $form = tap(Facades\Form::make('test')->title('Test'))
+            ->save();
+
+        Event::fake();
+
+        $submission = tap($form->makeSubmission([
+            'name' => 'John Doe',
+        ]))->save();
+
+        $result = $submission->deleteQuietly();
+
+        Event::assertNotDispatched(SubmissionDeleted::class);
+        $this->assertSame($result, true);
+
+        $submission = tap($form->makeSubmission([
+            'name' => 'John Doe',
+        ]))->save();
+
+        $submission->delete();
+
+        Event::assertDispatched(SubmissionDeleted::class);
+        $this->assertSame($result, true);
+    }
 }