@@ -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 | { |
@@ -32,6 +32,9 @@ discard block |
||
32 | 32 | app(FileManipulator::class)->createDerivedFiles($media); |
33 | 33 | } |
34 | 34 | |
35 | + /** |
|
36 | + * @param string $type |
|
37 | + */ |
|
35 | 38 | public function copyToMediaLibrary(string $pathToFile, Media $media, ?string $type = null, ?string $targetFileName = null) |
36 | 39 | { |
37 | 40 | $destinationFileName = $targetFileName ?: pathinfo($pathToFile, PATHINFO_BASENAME); |
@@ -73,6 +76,9 @@ discard block |
||
73 | 76 | return array_merge($mimeTypeHeader, $extraHeaders, $this->customRemoteHeaders, $mediaCustomHeaders); |
74 | 77 | } |
75 | 78 | |
79 | + /** |
|
80 | + * @return resource |
|
81 | + */ |
|
76 | 82 | public function getStream(Media $media) |
77 | 83 | { |
78 | 84 | $sourceFile = $this->getMediaDirectory($media).'/'.$media->file_name; |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\Filesystem; |
4 | 4 | |
5 | -use Spatie\MediaLibrary\Helpers\File; |
|
6 | -use Spatie\MediaLibrary\Models\Media; |
|
7 | -use Spatie\MediaLibrary\FileManipulator; |
|
8 | 5 | use Illuminate\Contracts\Filesystem\Factory; |
9 | -use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
10 | 6 | use Spatie\MediaLibrary\Conversion\ConversionCollection; |
7 | +use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
8 | +use Spatie\MediaLibrary\FileManipulator; |
|
9 | +use Spatie\MediaLibrary\Helpers\File; |
|
10 | +use Spatie\MediaLibrary\Models\Media; |
|
11 | 11 | use Spatie\MediaLibrary\PathGenerator\PathGeneratorFactory; |
12 | 12 | |
13 | 13 | class Filesystem |
@@ -5,10 +5,10 @@ |
||
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 | -use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator; |
|
9 | +use Spatie\MediaLibrary\Filesystem\Filesystem; |
|
11 | 10 | use Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator; |
11 | +use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator; |
|
12 | 12 | |
13 | 13 | class MediaLibraryServiceProvider extends ServiceProvider |
14 | 14 | { |