Fix data corruption bug when storage disk becomes invalid (#3139)

* Limit blast radius and not skip last line of test * Fix bug removing all media not just current
spatie · Dec 30, 2022 · e2f1f76 · e2f1f76
1 parent 9e1e1ee
commit e2f1f76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/MediaCollections/FileAdder.php b/src/MediaCollections/FileAdder.php
@@ -447,7 +447,7 @@ protected function processMediaItem(HasMedia $model, Media $media, self $fileAdd
         }
 
         if (! $addedMediaSuccessfully) {
-            $model->media()->delete($media->id);
+            $media->delete();
 
             throw DiskCannotBeAccessed::create($media->disk);
         }

diff --git a/tests/Feature/FileAdder/IntegrationTest.php b/tests/Feature/FileAdder/IntegrationTest.php
@@ -598,6 +598,13 @@
 });
 
 it('will throw and exception and not create a record in database if file cannot be added', function () {
+
+    $this->testModel
+            ->addMedia($this->getTestPng())
+            ->toMediaCollection();
+
+    expect(Media::count())->toBe(1);
+
     config()->set('filesystems.disks.invalid_disk', [
         'driver' => 's3',
         'secret' => 'test',
@@ -606,9 +613,11 @@
         'bucket' => 'test',
     ]);
 
-    $this->testModel
-        ->addMedia($this->getTestJpg())
-        ->toMediaCollection('default', 'invalid_disk');
+    expect(
+        fn () => $this->testModel
+            ->addMedia($this->getTestJpg())
+            ->toMediaCollection('default', 'invalid_disk')
+    )->toThrow(DiskCannotBeAccessed::class);
 
-    expect(Media::count())->toBe(0);
-})->throws(DiskCannotBeAccessed::class);
+    expect(Media::count())->toBe(1);
+});