@@ -4,8 +4,8 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Console\Command;  | 
                                                        
| 6 | 6 | use Illuminate\Console\ConfirmableTrait;  | 
                                                        
| 7 | -use Spatie\MediaLibrary\MediaRepository;  | 
                                                        |
| 8 | 7 | use Illuminate\Database\Eloquent\Collection;  | 
                                                        
| 8 | +use Spatie\MediaLibrary\MediaRepository;  | 
                                                        |
| 9 | 9 | |
| 10 | 10 | class ClearCommand extends Command  | 
                                                        
| 11 | 11 |  { | 
                                                        
@@ -2,18 +2,17 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\MediaLibrary\Commands;  | 
                                                        
| 4 | 4 | |
| 5 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 6 | 5 | use Illuminate\Console\Command;  | 
                                                        
| 7 | 6 | use Illuminate\Console\ConfirmableTrait;  | 
                                                        
| 8 | -use Spatie\MediaLibrary\FileManipulator;  | 
                                                        |
| 9 | -use Spatie\MediaLibrary\MediaRepository;  | 
                                                        |
| 10 | 7 | use Illuminate\Contracts\Filesystem\Factory;  | 
                                                        
| 11 | 8 | use Illuminate\Database\Eloquent\Collection;  | 
                                                        
| 12 | 9 | use Spatie\MediaLibrary\Conversion\Conversion;  | 
                                                        
| 13 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;  | 
                                                        |
| 14 | 10 | use Spatie\MediaLibrary\Conversion\ConversionCollection;  | 
                                                        
| 11 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;  | 
                                                        |
| 12 | +use Spatie\MediaLibrary\FileManipulator;  | 
                                                        |
| 13 | +use Spatie\MediaLibrary\MediaRepository;  | 
                                                        |
| 14 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 15 | 15 | use Spatie\MediaLibrary\PathGenerator\BasePathGenerator;  | 
                                                        
| 16 | -use Spatie\MediaLibrary\ResponsiveImages\ResponsiveImage;  | 
                                                        |
| 17 | 16 | use Spatie\MediaLibrary\ResponsiveImages\RegisteredResponsiveImages;  | 
                                                        
| 18 | 17 | |
| 19 | 18 | class CleanCommand extends Command  | 
                                                        
@@ -3,12 +3,12 @@  | 
                                                    ||
| 3 | 3 | namespace Spatie\MediaLibrary\Commands;  | 
                                                        
| 4 | 4 | |
| 5 | 5 | use Exception;  | 
                                                        
| 6 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 7 | 6 | use Illuminate\Console\Command;  | 
                                                        
| 8 | -use Illuminate\Support\Collection;  | 
                                                        |
| 9 | 7 | use Illuminate\Console\ConfirmableTrait;  | 
                                                        
| 8 | +use Illuminate\Support\Collection;  | 
                                                        |
| 10 | 9 | use Spatie\MediaLibrary\FileManipulator;  | 
                                                        
| 11 | 10 | use Spatie\MediaLibrary\MediaRepository;  | 
                                                        
| 11 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 12 | 12 | |
| 13 | 13 | class RegenerateCommand extends Command  | 
                                                        
| 14 | 14 |  { | 
                                                        
@@ -2,13 +2,13 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\MediaLibrary\Conversion;  | 
                                                        
| 4 | 4 | |
| 5 | +use Illuminate\Database\Eloquent\Relations\Relation;  | 
                                                        |
| 5 | 6 | use Illuminate\Support\Arr;  | 
                                                        
| 6 | -use Spatie\MediaLibrary\HasMedia\HasMedia;  | 
                                                        |
| 7 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 8 | -use Spatie\Image\Manipulations;  | 
                                                        |
| 9 | 7 | use Illuminate\Support\Collection;  | 
                                                        
| 10 | -use Illuminate\Database\Eloquent\Relations\Relation;  | 
                                                        |
| 8 | +use Spatie\Image\Manipulations;  | 
                                                        |
| 11 | 9 | use Spatie\MediaLibrary\Exceptions\InvalidConversion;  | 
                                                        
| 10 | +use Spatie\MediaLibrary\HasMedia\HasMedia;  | 
                                                        |
| 11 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 12 | 12 | |
| 13 | 13 | class ConversionCollection extends Collection  | 
                                                        
| 14 | 14 |  { | 
                                                        
@@ -2,23 +2,22 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\MediaLibrary\FileAdder;  | 
                                                        
| 4 | 4 | |
| 5 | +use Illuminate\Database\Eloquent\Model;  | 
                                                        |
| 6 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\DiskDoesNotExist;  | 
                                                        |
| 7 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileDoesNotExist;  | 
                                                        |
| 8 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileIsTooBig;  | 
                                                        |
| 5 | 9 | use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileUnacceptableForCollection;  | 
                                                        
| 10 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnknownType;  | 
                                                        |
| 6 | 11 | use Spatie\MediaLibrary\File as PendingFile;  | 
                                                        
| 7 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 8 | -use Spatie\MediaLibrary\Helpers\File;  | 
                                                        |
| 9 | -use Illuminate\Database\Eloquent\Model;  | 
                                                        |
| 10 | 12 | use Spatie\MediaLibrary\Filesystem\Filesystem;  | 
                                                        
| 11 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded;  | 
                                                        |
| 12 | 13 | use Spatie\MediaLibrary\HasMedia\HasMedia;  | 
                                                        
| 14 | +use Spatie\MediaLibrary\Helpers\File;  | 
                                                        |
| 15 | +use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image as ImageGenerator;  | 
                                                        |
| 16 | +use Spatie\MediaLibrary\Jobs\GenerateResponsiveImages;  | 
                                                        |
| 13 | 17 | use Spatie\MediaLibrary\MediaCollection\MediaCollection;  | 
                                                        
| 14 | -use Symfony\Component\HttpFoundation\File\UploadedFile;  | 
                                                        |
| 18 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 15 | 19 | use Symfony\Component\HttpFoundation\File\File as SymfonyFile;  | 
                                                        
| 16 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnknownType;  | 
                                                        |
| 17 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileIsTooBig;  | 
                                                        |
| 18 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\DiskDoesNotExist;  | 
                                                        |
| 19 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileDoesNotExist;  | 
                                                        |
| 20 | -use Spatie\MediaLibrary\Jobs\GenerateResponsiveImages;  | 
                                                        |
| 21 | -use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image as ImageGenerator;  | 
                                                        |
| 20 | +use Symfony\Component\HttpFoundation\File\UploadedFile;  | 
                                                        |
| 22 | 21 | |
| 23 | 22 | class FileAdder  | 
                                                        
| 24 | 23 |  { | 
                                                        
@@ -2,19 +2,19 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\MediaLibrary;  | 
                                                        
| 4 | 4 | |
| 5 | -use Spatie\Image\Image;  | 
                                                        |
| 6 | -use Illuminate\Support\Facades\File;  | 
                                                        |
| 7 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 8 | 5 | use Illuminate\Contracts\Bus\Dispatcher;  | 
                                                        
| 6 | +use Illuminate\Support\Facades\File;  | 
                                                        |
| 7 | +use Spatie\Image\Image;  | 
                                                        |
| 9 | 8 | use Spatie\MediaLibrary\Conversion\Conversion;  | 
                                                        
| 10 | -use Spatie\MediaLibrary\Filesystem\Filesystem;  | 
                                                        |
| 11 | -use Spatie\MediaLibrary\Jobs\PerformConversions;  | 
                                                        |
| 12 | -use Spatie\MediaLibrary\Events\ConversionWillStart;  | 
                                                        |
| 13 | -use Spatie\MediaLibrary\Helpers\TemporaryDirectory;  | 
                                                        |
| 14 | -use Spatie\MediaLibrary\ImageGenerators\ImageGenerator;  | 
                                                        |
| 15 | 9 | use Spatie\MediaLibrary\Conversion\ConversionCollection;  | 
                                                        
| 16 | 10 | use Spatie\MediaLibrary\Events\ConversionHasBeenCompleted;  | 
                                                        
| 11 | +use Spatie\MediaLibrary\Events\ConversionWillStart;  | 
                                                        |
| 12 | +use Spatie\MediaLibrary\Filesystem\Filesystem;  | 
                                                        |
| 17 | 13 | use Spatie\MediaLibrary\Helpers\File as MediaLibraryFileHelper;  | 
                                                        
| 14 | +use Spatie\MediaLibrary\Helpers\TemporaryDirectory;  | 
                                                        |
| 15 | +use Spatie\MediaLibrary\ImageGenerators\ImageGenerator;  | 
                                                        |
| 16 | +use Spatie\MediaLibrary\Jobs\PerformConversions;  | 
                                                        |
| 17 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 18 | 18 | use Spatie\MediaLibrary\ResponsiveImages\ResponsiveImageGenerator;  | 
                                                        
| 19 | 19 | |
| 20 | 20 | class FileManipulator  | 
                                                        
@@ -72,6 +72,9 @@  | 
                                                    ||
| 72 | 72 | return array_merge($mimeTypeHeader, $extraHeaders, $this->customRemoteHeaders);  | 
                                                        
| 73 | 73 | }  | 
                                                        
| 74 | 74 | |
| 75 | + /**  | 
                                                        |
| 76 | + * @return resource  | 
                                                        |
| 77 | + */  | 
                                                        |
| 75 | 78 | public function getStream(Media $media)  | 
                                                        
| 76 | 79 |      { | 
                                                        
| 77 | 80 | $sourceFile = $this->getMediaDirectory($media).'/'.$media->file_name;  | 
                                                        
@@ -2,11 +2,11 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\MediaLibrary\Filesystem;  | 
                                                        
| 4 | 4 | |
| 5 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 6 | -use Spatie\MediaLibrary\Helpers\File;  | 
                                                        |
| 7 | -use Spatie\MediaLibrary\FileManipulator;  | 
                                                        |
| 8 | 5 | use Illuminate\Contracts\Filesystem\Factory;  | 
                                                        
| 9 | 6 | use Spatie\MediaLibrary\Events\MediaHasBeenAdded;  | 
                                                        
| 7 | +use Spatie\MediaLibrary\FileManipulator;  | 
                                                        |
| 8 | +use Spatie\MediaLibrary\Helpers\File;  | 
                                                        |
| 9 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 10 | 10 | use Spatie\MediaLibrary\PathGenerator\PathGeneratorFactory;  | 
                                                        
| 11 | 11 | |
| 12 | 12 | class DefaultFilesystem implements Filesystem  | 
                                                        
@@ -3,22 +3,22 @@  | 
                                                    ||
| 3 | 3 | namespace Spatie\MediaLibrary\HasMedia;  | 
                                                        
| 4 | 4 | |
| 5 | 5 | use DateTimeInterface;  | 
                                                        
| 6 | +use Illuminate\Database\Eloquent\SoftDeletes;  | 
                                                        |
| 6 | 7 | use Illuminate\Http\File;  | 
                                                        
| 7 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 8 | 8 | use Illuminate\Support\Collection;  | 
                                                        
| 9 | -use Spatie\MediaLibrary\MediaCollection\MediaCollection;  | 
                                                        |
| 10 | -use Spatie\MediaLibrary\MediaRepository;  | 
                                                        |
| 11 | 9 | use Illuminate\Support\Facades\Validator;  | 
                                                        
| 12 | -use Spatie\MediaLibrary\FileAdder\FileAdder;  | 
                                                        |
| 13 | -use Illuminate\Database\Eloquent\SoftDeletes;  | 
                                                        |
| 14 | 10 | use Spatie\MediaLibrary\Conversion\Conversion;  | 
                                                        
| 15 | -use Spatie\MediaLibrary\FileAdder\FileAdderFactory;  | 
                                                        |
| 16 | 11 | use Spatie\MediaLibrary\Events\CollectionHasBeenCleared;  | 
                                                        
| 17 | -use Spatie\MediaLibrary\Exceptions\MediaCannotBeDeleted;  | 
                                                        |
| 18 | -use Spatie\MediaLibrary\Exceptions\MediaCannotBeUpdated;  | 
                                                        |
| 19 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnreachableUrl;  | 
                                                        |
| 20 | 12 | use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\InvalidBase64Data;  | 
                                                        
| 21 | 13 | use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\MimeTypeNotAllowed;  | 
                                                        
| 14 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnreachableUrl;  | 
                                                        |
| 15 | +use Spatie\MediaLibrary\Exceptions\MediaCannotBeDeleted;  | 
                                                        |
| 16 | +use Spatie\MediaLibrary\Exceptions\MediaCannotBeUpdated;  | 
                                                        |
| 17 | +use Spatie\MediaLibrary\FileAdder\FileAdder;  | 
                                                        |
| 18 | +use Spatie\MediaLibrary\FileAdder\FileAdderFactory;  | 
                                                        |
| 19 | +use Spatie\MediaLibrary\MediaCollection\MediaCollection;  | 
                                                        |
| 20 | +use Spatie\MediaLibrary\MediaRepository;  | 
                                                        |
| 21 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 22 | 22 | |
| 23 | 23 | trait HasMediaTrait  | 
                                                        
| 24 | 24 |  { | 
                                                        
@@ -2,8 +2,8 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\MediaLibrary\ImageGenerators;  | 
                                                        
| 4 | 4 | |
| 5 | -use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 6 | 5 | use Illuminate\Support\Collection;  | 
                                                        
| 6 | +use Spatie\MediaLibrary\Models\Media;  | 
                                                        |
| 7 | 7 | |
| 8 | 8 | abstract class BaseGenerator implements ImageGenerator  | 
                                                        
| 9 | 9 |  { |