Merge remote-tracking branch 'origin/main'

Author: nickverschoor

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-medialibrary` will be documented in this file
 
+## v2.0.0 - 2025-01-30
+
+**Full Changelog**: https://github.com/programic/laravel-medialibrary/compare/v1.0.10...v2.0.0
+
 ## 11.12.1 - 2025-01-13
 
 ### What's Changed

src/Conversions/Actions/PerformManipulationsAction.php

@@ -4,10 +4,10 @@
 
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
-use Spatie\Image\Exceptions\UnsupportedImageFormat;
-use Spatie\Image\Image;
 use Programic\MediaLibrary\Conversions\Conversion;
 use Programic\MediaLibrary\MediaCollections\Models\Media;
+use Spatie\Image\Exceptions\UnsupportedImageFormat;
+use Spatie\Image\Image;
 
 class PerformManipulationsAction
 {

src/Conversions/Conversion.php

@@ -4,10 +4,10 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Traits\Conditionable;
-use Spatie\ImageOptimizer\OptimizerChainFactory;
 use Programic\MediaLibrary\MediaCollections\Models\Media;
 use Programic\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator;
 use Programic\MediaLibrary\Support\FileNamer\FileNamer;
+use Spatie\ImageOptimizer\OptimizerChainFactory;
 
 /** @mixin \Spatie\Image\Drivers\ImageDriver */
 class Conversion

src/Conversions/ConversionCollection.php

@@ -29,7 +29,9 @@ public function setMedia(Media $media): self
 
         $this->items = [];
 
-        if (!$media->attachable) $this->addConversionsFromRelatedModel($media);
+        if (! $media->attachable) {
+            $this->addConversionsFromRelatedModel($media);
+        }
 
         $this->addManipulationsFromDb($media);
 
@@ -51,6 +53,7 @@ protected function addConversionsFromRelatedModel(Media $media): void
     {
         if ($media->attachable) {
             $this->items = [];
+
             return;
         }
 

src/HasAttachableMedia.php

@@ -11,19 +11,13 @@ interface HasAttachableMedia
     public function attachableMedia(): MorphToMany;
 
     /**
-     * @param array|Collection|Media $ids
-     * @param bool $detaching Detach media missing in $ids?
-     * @return array
+     * @param  bool  $detaching  Detach media missing in $ids?
      */
     public function attachMedia(array|Media|Collection $ids, bool $detaching): array;
 
-    /**
-     * @param array|Collection|Media $ids
-     * @return int
-     */
     public function detachMedia(array|Media|Collection $ids): int;
 
-//    public function hasAttachableMedia(string $collectionName = ''): bool;
-//
-//    public function getAttachableMedia(string $collectionName = 'default', array|callable $filters = []): Collection;
+    //    public function hasAttachableMedia(string $collectionName = ''): bool;
+    //
+    //    public function getAttachableMedia(string $collectionName = 'default', array|callable $filters = []): Collection;
 }

src/InteractsWithMedia.php

@@ -67,7 +67,7 @@ public function media(): MorphMany
 
     public function attachableMedia(): MorphToMany
     {
-        return $this->morphToMany(config('media-library.media_model'),'mediable');
+        return $this->morphToMany(config('media-library.media_model'), 'mediable');
     }
 
     /**

src/MediaCollections/FileAdder.php

@@ -438,7 +438,7 @@ public function sanitizingFileName(callable $fileNameSanitizer): self
 
     protected function attachMedia(Media $media): void
     {
-        if ($this->subject && !$this->subject->exists) {
+        if ($this->subject && ! $this->subject->exists) {
             $this->subject->prepareToAttachMedia($media, $this);
 
             $class = $this->subject::class;
@@ -522,7 +522,9 @@ protected function processMediaItem(?HasMedia $model, Media $media, self $fileAd
 
     protected function getMediaCollection(string $collectionName): ?MediaCollection
     {
-        if (! $this->subject) return null;
+        if (! $this->subject) {
+            return null;
+        }
 
         $this->subject->registerMediaCollections();
 

src/MediaCollections/FileReplacer.php

@@ -15,7 +15,9 @@ public function __construct(
         protected Media $originalMedia,
         protected ?Filesystem $filesystem
     ) {
-        if (! $this->originalMedia->attachable) throw new MediaCannotBeUpdated('Media is not attachable.');
+        if (! $this->originalMedia->attachable) {
+            throw new MediaCannotBeUpdated('Media is not attachable.');
+        }
 
         parent::__construct($filesystem);
     }

src/MediaCollections/Models/Media.php

@@ -37,8 +37,8 @@
 use Programic\MediaLibrary\Support\UrlGenerator\UrlGenerator;
 use Programic\MediaLibrary\Support\UrlGenerator\UrlGeneratorFactory;
 use Programic\MediaLibraryPro\Models\TemporaryUpload;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * @property string $uuid

src/MediaLibraryServiceProvider.php

@@ -2,8 +2,6 @@
 
 namespace Programic\MediaLibrary;
 
-use Spatie\LaravelPackageTools\Package;
-use Spatie\LaravelPackageTools\PackageServiceProvider;
 use Programic\MediaLibrary\Conversions\Commands\RegenerateCommand;
 use Programic\MediaLibrary\MediaCollections\Commands\CleanCommand;
 use Programic\MediaLibrary\MediaCollections\Commands\ClearCommand;
@@ -12,6 +10,8 @@
 use Programic\MediaLibrary\MediaCollections\Models\Observers\MediaObserver;
 use Programic\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator;
 use Programic\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
 class MediaLibraryServiceProvider extends PackageServiceProvider
 {
@@ -49,4 +49,3 @@ public function packageRegistered(): void
         });
     }
 }
-