Apply fixes from StyleCI (spatie#956)

config/medialibrary.php

@@ -57,13 +57,13 @@
         */
         'width_calculator' => Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\FileSizeOptimizedWidthCalculator::class,
 
-        /**
+        /*
          * By default rendering media to a responsive image will add some javascript and a tiny placeholder.
          * This ensures that the browser can already determine the correct layout.
          */
         'use_tiny_placeholders' => true,
 
-        /**
+        /*
          * This class will generate the tiny placeholder used for progressive image loading. By default
          * the medialibrary will use a tiny blurred jpg image.
          */

src/Commands/CleanCommand.php

@@ -2,8 +2,8 @@
 
 namespace Spatie\MediaLibrary\Commands;
 
-use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Console\Command;
+use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Console\ConfirmableTrait;
 use Spatie\MediaLibrary\FileManipulator;
 use Spatie\MediaLibrary\MediaRepository;
@@ -13,7 +13,6 @@
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;
 use Spatie\MediaLibrary\Conversion\ConversionCollection;
 use Spatie\MediaLibrary\PathGenerator\BasePathGenerator;
-use Spatie\MediaLibrary\ResponsiveImages\ResponsiveImage;
 use Spatie\MediaLibrary\ResponsiveImages\RegisteredResponsiveImages;
 
 class CleanCommand extends Command

src/Commands/RegenerateCommand.php

@@ -3,9 +3,9 @@
 namespace Spatie\MediaLibrary\Commands;
 
 use Exception;
-use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
+use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Console\ConfirmableTrait;
 use Spatie\MediaLibrary\FileManipulator;
 use Spatie\MediaLibrary\MediaRepository;

src/Conversion/ConversionCollection.php

@@ -3,16 +3,15 @@
 namespace Spatie\MediaLibrary\Conversion;
 
 use Illuminate\Support\Arr;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\Models\Media;
 use Spatie\Image\Manipulations;
 use Illuminate\Support\Collection;
+use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Spatie\MediaLibrary\Exceptions\InvalidConversion;
 
 class ConversionCollection extends Collection
 {
-    /** @var \Spatie\MediaLibrary\Media  */
+    /** @var \Spatie\MediaLibrary\Media */
     protected $media;
 
     /**

src/Exceptions/FileCannotBeAdded/FileUnacceptableForCollection.php

@@ -2,9 +2,9 @@
 
 namespace Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;
 
-use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;
 use Spatie\MediaLibrary\File;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
+use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;
 use Spatie\MediaLibrary\MediaCollection\MediaCollection;
 
 class FileUnacceptableForCollection extends FileCannotBeAdded

src/File.php

@@ -31,6 +31,4 @@ public function __toString()
     {
         return "name: {$this->name}, size: {$this->size}, mime: {$this->mimeType}";
     }
-
-
-}
+}

src/FileAdder/FileAdder.php

@@ -2,23 +2,22 @@
 
 namespace Spatie\MediaLibrary\FileAdder;
 
-use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileUnacceptableForCollection;
-use Spatie\MediaLibrary\File as PendingFile;
-use Spatie\MediaLibrary\Models\Media;
 use Spatie\MediaLibrary\Helpers\File;
+use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Database\Eloquent\Model;
-use Spatie\MediaLibrary\Filesystem\Filesystem;
-use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\MediaCollection\MediaCollection;
+use Spatie\MediaLibrary\File as PendingFile;
+use Spatie\MediaLibrary\Filesystem\Filesystem;
+use Spatie\MediaLibrary\Jobs\GenerateResponsiveImages;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Spatie\MediaLibrary\MediaCollection\MediaCollection;
 use Symfony\Component\HttpFoundation\File\File as SymfonyFile;
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnknownType;
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileIsTooBig;
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\DiskDoesNotExist;
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileDoesNotExist;
-use Spatie\MediaLibrary\Jobs\GenerateResponsiveImages;
 use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image as ImageGenerator;
+use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileUnacceptableForCollection;
 
 class FileAdder
 {
@@ -105,15 +104,15 @@ public function setFile($file): self
         }
 
         if ($file instanceof UploadedFile) {
-            $this->pathToFile = $file->getPath() . '/' . $file->getFilename();
+            $this->pathToFile = $file->getPath().'/'.$file->getFilename();
             $this->setFileName($file->getClientOriginalName());
             $this->mediaName = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME);
 
             return $this;
         }
 
         if ($file instanceof SymfonyFile) {
-            $this->pathToFile = $file->getPath() . '/' . $file->getFilename();
+            $this->pathToFile = $file->getPath().'/'.$file->getFilename();
             $this->setFileName(pathinfo($file->getFilename(), PATHINFO_BASENAME));
             $this->mediaName = pathinfo($file->getFilename(), PATHINFO_FILENAME);
 
@@ -201,7 +200,7 @@ public function toMediaCollectionOnCloudDisk(string $collectionName = 'default')
 
     public function toMediaCollection(string $collectionName = 'default', string $diskName = ''): Media
     {
-        if (!is_file($this->pathToFile)) {
+        if (! is_file($this->pathToFile)) {
             throw FileDoesNotExist::create($this->pathToFile);
         }
 
@@ -272,7 +271,7 @@ public function sanitizingFileName(callable $fileNameSanitizer): self
 
     protected function attachMedia(Media $media)
     {
-        if (!$this->subject->exists) {
+        if (! $this->subject->exists) {
             $this->subject->prepareToAttachMedia($media, $this);
 
             $class = get_class($this->subject);
@@ -289,15 +288,15 @@ protected function attachMedia(Media $media)
         $this->processMediaItem($this->subject, $media, $this);
     }
 
-    protected function processMediaItem(HasMedia $model, Media $media, FileAdder $fileAdder)
+    protected function processMediaItem(HasMedia $model, Media $media, self $fileAdder)
     {
         $this->guardAgainstDisallowedFileAdditions($media, $model);
 
         $model->media()->save($media);
 
         $this->filesystem->add($fileAdder->pathToFile, $media, $fileAdder->fileName);
 
-        if (!$fileAdder->preserveOriginal) {
+        if (! $fileAdder->preserveOriginal) {
             unlink($fileAdder->pathToFile);
         }
 

src/FileAdder/FileAdderFactory.php

@@ -30,13 +30,13 @@ public static function createMultipleFromRequest(Model $subject, array $keys = [
     {
         return collect($keys)
             ->map(function (string $key) use ($subject) {
-                if (!request()->hasFile($key)) {
+                if (! request()->hasFile($key)) {
                     throw RequestDoesNotHaveFile::create($key);
                 }
 
                 $files = request()->file($key);
 
-                if (!is_array($files)) {
+                if (! is_array($files)) {
                     return static::create($subject, $files);
                 }
 

src/FileManipulator.php

@@ -85,8 +85,8 @@ public function performConversions(ConversionCollection $conversions, Media $med
 
                 $conversionResult = $this->performConversion($media, $conversion, $copiedOriginalFile);
 
-                $newFileName = pathinfo($media->file_name, PATHINFO_FILENAME) .
-                    '-' .$conversion->getName() .
+                $newFileName = pathinfo($media->file_name, PATHINFO_FILENAME).
+                    '-'.$conversion->getName().
                     '.'.$conversion->getResultExtension(pathinfo($copiedOriginalFile, PATHINFO_EXTENSION));
 
                 $renamedFile = MediaLibraryFileHelper::renameInDirectory($conversionResult, $newFileName);

src/Filesystem/DefaultFilesystem.php

@@ -2,8 +2,8 @@
 
 namespace Spatie\MediaLibrary\Filesystem;
 
-use Spatie\MediaLibrary\Models\Media;
 use Spatie\MediaLibrary\Helpers\File;
+use Spatie\MediaLibrary\Models\Media;
 use Spatie\MediaLibrary\FileManipulator;
 use Illuminate\Contracts\Filesystem\Factory;
 use Spatie\MediaLibrary\Events\MediaHasBeenAdded;
@@ -131,7 +131,7 @@ public function getMediaDirectory(Media $media, ?string $type = null) : string
     {
         $pathGenerator = PathGeneratorFactory::create();
 
-        if (!$type) {
+        if (! $type) {
             $directory = $pathGenerator->getPath($media);
         }
 

src/HasMedia/HasMedia.php

@@ -2,8 +2,8 @@
 
 namespace Spatie\MediaLibrary\HasMedia;
 
-use Spatie\MediaLibrary\Conversion\Conversion;
 use Spatie\MediaLibrary\Models\Media;
+use Spatie\MediaLibrary\Conversion\Conversion;
 
 interface HasMedia
 {
@@ -84,7 +84,6 @@ public function shouldDeletePreservingMedia();
      */
     public function loadMedia(string $collectionName);
 
-
     /*
      * Add a conversion.
      */

src/HasMedia/HasMediaTrait.php

@@ -4,9 +4,8 @@
 
 use DateTimeInterface;
 use Illuminate\Http\File;
-use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Support\Collection;
-use Spatie\MediaLibrary\MediaCollection\MediaCollection;
+use Spatie\MediaLibrary\Models\Media;
 use Spatie\MediaLibrary\MediaRepository;
 use Illuminate\Support\Facades\Validator;
 use Spatie\MediaLibrary\FileAdder\FileAdder;
@@ -16,6 +15,7 @@
 use Spatie\MediaLibrary\Events\CollectionHasBeenCleared;
 use Spatie\MediaLibrary\Exceptions\MediaCannotBeDeleted;
 use Spatie\MediaLibrary\Exceptions\MediaCannotBeUpdated;
+use Spatie\MediaLibrary\MediaCollection\MediaCollection;
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnreachableUrl;
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\InvalidBase64Data;
 use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\MimeTypeNotAllowed;
@@ -42,7 +42,7 @@ public static function bootHasMediaTrait()
             }
 
             if (in_array(SoftDeletes::class, trait_uses_recursive($entity))) {
-                if (!$entity->forceDeleting) {
+                if (! $entity->forceDeleting) {
                     return;
                 }
             }
@@ -119,7 +119,7 @@ public function addAllMediaFromRequest()
      */
     public function addMediaFromUrl(string $url, ...$allowedMimeTypes)
     {
-        if (!$stream = @fopen($url, 'r')) {
+        if (! $stream = @fopen($url, 'r')) {
             throw UnreachableUrl::create($url);
         }
 
@@ -227,7 +227,7 @@ public function getFirstMediaUrl(string $collectionName = 'default', string $con
     {
         $media = $this->getFirstMedia($collectionName);
 
-        if (!$media) {
+        if (! $media) {
             return '';
         }
 
@@ -243,7 +243,7 @@ public function getFirstTemporaryUrl(DateTimeInterface $expiration, string $coll
     {
         $media = $this->getFirstMedia($collectionName);
 
-        if (!$media) {
+        if (! $media) {
             return '';
         }
 
@@ -259,7 +259,7 @@ public function getFirstMediaPath(string $collectionName = 'default', string $co
     {
         $media = $this->getFirstMedia($collectionName);
 
-        if (!$media) {
+        if (! $media) {
             return '';
         }
 
@@ -386,7 +386,7 @@ public function deleteMedia($mediaId)
 
         $media = $this->media->find($mediaId);
 
-        if (!$media) {
+        if (! $media) {
             throw MediaCannotBeDeleted::doesNotBelongToModel($mediaId, $this);
         }
 
@@ -490,7 +490,7 @@ protected function guardAgainstInvalidMimeType(string $file, ...$allowedMimeType
 
         $validation = Validator::make(
             ['file' => new File($file)],
-            ['file' => 'mimetypes:' . implode(',', $allowedMimeTypes)]
+            ['file' => 'mimetypes:'.implode(',', $allowedMimeTypes)]
         );
 
         if ($validation->fails()) {

src/Helpers/TemporaryDirectory.php

@@ -8,7 +8,7 @@ class TemporaryDirectory
 {
     public static function create(): BaseTemporaryDirectory
     {
-        return (new BaseTemporaryDirectory(static::getTemporaryDirectoryPath()));
+        return new BaseTemporaryDirectory(static::getTemporaryDirectoryPath());
     }
 
     protected static function getTemporaryDirectoryPath(): string

src/ImageGenerators/BaseGenerator.php

@@ -2,8 +2,8 @@
 
 namespace Spatie\MediaLibrary\ImageGenerators;
 
-use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Support\Collection;
+use Spatie\MediaLibrary\Models\Media;
 
 abstract class BaseGenerator implements ImageGenerator
 {

src/Jobs/GenerateResponsiveImages.php

@@ -6,7 +6,6 @@
 use Spatie\MediaLibrary\Models\Media;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
-use Spatie\MediaLibrary\FileManipulator;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Spatie\MediaLibrary\ResponsiveImages\ResponsiveImageGenerator;
 

src/MediaCollection/MediaCollection.php

@@ -2,9 +2,6 @@
 
 namespace Spatie\MediaLibrary\MediaCollection;
 
-use Spatie\MediaLibrary\File;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-
 class MediaCollection
 {
     /** @var string */
@@ -26,9 +23,12 @@ public function __construct(string $name)
     {
         $this->name = $name;
 
-        $this->mediaConversionRegistrations = function() {};
+        $this->mediaConversionRegistrations = function () {
+        };
 
-        $this->acceptsFile = function() { return true; };
+        $this->acceptsFile = function () {
+            return true;
+        };
     }
 
     public static function create($name)
@@ -61,4 +61,4 @@ public function registerMediaConversions(callable $mediaConversionRegistrations)
     {
         $this->mediaConversionRegistrations = $mediaConversionRegistrations;
     }
-}
+}

src/MediaLibraryServiceProvider.php

@@ -2,17 +2,13 @@
 
 namespace Spatie\MediaLibrary;
 
-use Illuminate\Support\Facades\Route;
-use Spatie\MediaLibrary\MediaObserver;
 use Illuminate\Support\ServiceProvider;
+use Spatie\MediaLibrary\Commands\CleanCommand;
 use Spatie\MediaLibrary\Commands\ClearCommand;
 use Spatie\MediaLibrary\Filesystem\Filesystem;
-use Spatie\MediaLibrary\Commands\CleanCommand;
 use Spatie\MediaLibrary\Commands\RegenerateCommand;
 use Spatie\MediaLibrary\Filesystem\DefaultFilesystem;
-use Spatie\MediaLibrary\Uploads\Commands\DeleteOldTemporaryUploads;
 use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator;
-use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\FileSizeOptimizedWidthCalculator;
 use Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator;
 
 class MediaLibraryServiceProvider extends ServiceProvider