add null check in setNewOrder (#3649)

* add null check * return array if null * check file exist before unlink
spatie · Jul 15, 2024 · b9b1113 · b9b1113
1 parent 55decc7
commit b9b1113
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/MediaCollections/FileAdder.php b/src/MediaCollections/FileAdder.php
@@ -460,7 +460,9 @@ protected function processMediaItem(HasMedia $model, Media $media, self $fileAdd
             if ($fileAdder->file instanceof RemoteFile) {
                 Storage::disk($fileAdder->file->getDisk())->delete($fileAdder->file->getKey());
             } else {
-                unlink($fileAdder->pathToFile);
+                if (file_exists($fileAdder->pathToFile)) {
+                    unlink($fileAdder->pathToFile);
+                }
             }
         }
 

diff --git a/src/MediaCollections/Models/Concerns/IsSorted.php b/src/MediaCollections/Models/Concerns/IsSorted.php
@@ -35,6 +35,9 @@ public static function setNewOrder(array $ids, int $startOrder = 1): void
     {
         foreach ($ids as $id) {
             $model = static::find($id);
+            if (!$model) {
+                continue;
+            }
 
             $orderColumnName = $model->determineOrderColumnName();
 

diff --git a/src/Support/FileRemover/DefaultFileRemover.php b/src/Support/FileRemover/DefaultFileRemover.php
@@ -100,7 +100,7 @@ public function removeFromResponsiveImagesDirectory(Media $media, string $disk):
                 try {
                     $allFilePaths = $this->filesystem->disk($disk)->allFiles($directory);
 
-                    $conversions = array_keys($media->generated_conversions);
+                    $conversions = array_keys($media->generated_conversions ?? []);
                     $conversions[] = 'media_library_original';
 
                     $imagePaths = array_filter(