@@ -5,11 +5,11 @@ |
||
5 | 5 | use Illuminate\Support\ServiceProvider; |
6 | 6 | use Spatie\MediaLibrary\Commands\CleanCommand; |
7 | 7 | use Spatie\MediaLibrary\Commands\ClearCommand; |
8 | -use Spatie\MediaLibrary\Filesystem\Filesystem; |
|
9 | 8 | use Spatie\MediaLibrary\Commands\RegenerateCommand; |
10 | 9 | use Spatie\MediaLibrary\Filesystem\DefaultFilesystem; |
11 | -use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator; |
|
10 | +use Spatie\MediaLibrary\Filesystem\Filesystem; |
|
12 | 11 | use Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator; |
12 | +use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator; |
|
13 | 13 | |
14 | 14 | class MediaLibraryServiceProvider extends ServiceProvider |
15 | 15 | { |
@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary; |
4 | 4 | |
5 | -use ZipStream\ZipStream; |
|
5 | +use Illuminate\Contracts\Support\Responsable; |
|
6 | 6 | use Illuminate\Support\Collection; |
7 | 7 | use Spatie\MediaLibrary\Models\Media; |
8 | -use Illuminate\Contracts\Support\Responsable; |
|
9 | 8 | use Symfony\Component\HttpFoundation\StreamedResponse; |
9 | +use ZipStream\ZipStream; |
|
10 | 10 | |
11 | 11 | class MediaStream implements Responsable |
12 | 12 | { |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\UrlGenerator; |
4 | 4 | |
5 | -use Spatie\MediaLibrary\Models\Media; |
|
5 | +use Illuminate\Contracts\Config\Repository as Config; |
|
6 | 6 | use Spatie\MediaLibrary\Conversion\Conversion; |
7 | +use Spatie\MediaLibrary\Models\Media; |
|
7 | 8 | use Spatie\MediaLibrary\PathGenerator\PathGenerator; |
8 | -use Illuminate\Contracts\Config\Repository as Config; |
|
9 | 9 | |
10 | 10 | abstract class BaseUrlGenerator implements UrlGenerator |
11 | 11 | { |
@@ -3,16 +3,16 @@ |
||
3 | 3 | namespace Spatie\MediaLibrary\ResponsiveImages; |
4 | 4 | |
5 | 5 | use Spatie\Image\Image; |
6 | -use Spatie\MediaLibrary\Helpers\File; |
|
7 | -use Spatie\MediaLibrary\Models\Media; |
|
8 | 6 | use Spatie\MediaLibrary\Conversion\Conversion; |
7 | +use Spatie\MediaLibrary\Events\ResponsiveImagesGenerated; |
|
9 | 8 | use Spatie\MediaLibrary\Filesystem\Filesystem; |
9 | +use Spatie\MediaLibrary\Helpers\File; |
|
10 | 10 | use Spatie\MediaLibrary\Helpers\TemporaryDirectory; |
11 | -use Spatie\MediaLibrary\Events\ResponsiveImagesGenerated; |
|
11 | +use Spatie\MediaLibrary\Models\Media; |
|
12 | 12 | use Spatie\MediaLibrary\ResponsiveImages\Exceptions\InvalidTinyJpg; |
13 | +use Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator; |
|
13 | 14 | use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator; |
14 | 15 | use Spatie\TemporaryDirectory\TemporaryDirectory as BaseTemporaryDirectory; |
15 | -use Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator; |
|
16 | 16 | |
17 | 17 | class ResponsiveImageGenerator |
18 | 18 | { |
@@ -76,6 +76,9 @@ discard block |
||
76 | 76 | return array_merge($mimeTypeHeader, $extraHeaders, $this->customRemoteHeaders, $mediaCustomHeaders); |
77 | 77 | } |
78 | 78 | |
79 | + /** |
|
80 | + * @return resource |
|
81 | + */ |
|
79 | 82 | public function getStream(Media $media) |
80 | 83 | { |
81 | 84 | $sourceFile = $this->getMediaDirectory($media).'/'.$media->file_name; |
@@ -162,6 +165,9 @@ discard block |
||
162 | 165 | } |
163 | 166 | } |
164 | 167 | |
168 | + /** |
|
169 | + * @param string $oldFileName |
|
170 | + */ |
|
165 | 171 | protected function renameResponsiveImages(Media $media, $oldFileName) |
166 | 172 | { |
167 | 173 | $newFileName = pathinfo($media->file_name, PATHINFO_FILENAME); |
@@ -2,16 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\Filesystem; |
4 | 4 | |
5 | -use Spatie\MediaLibrary\Conversion\Conversion; |
|
5 | +use Illuminate\Contracts\Filesystem\Factory; |
|
6 | 6 | use Spatie\MediaLibrary\Conversion\ConversionCollection; |
7 | +use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
8 | +use Spatie\MediaLibrary\FileManipulator; |
|
7 | 9 | use Spatie\MediaLibrary\Helpers\File; |
8 | 10 | use Spatie\MediaLibrary\Models\Media; |
9 | -use Spatie\MediaLibrary\FileManipulator; |
|
10 | -use Illuminate\Contracts\Filesystem\Factory; |
|
11 | -use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
12 | 11 | use Spatie\MediaLibrary\PathGenerator\PathGeneratorFactory; |
13 | -use Spatie\MediaLibrary\ResponsiveImages\ResponsiveImage; |
|
14 | -use Spatie\MediaLibrary\ResponsiveImages\ResponsiveImageGenerator; |
|
15 | 12 | |
16 | 13 | class DefaultFilesystem implements Filesystem |
17 | 14 | { |