@@ -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 | { |
@@ -3,23 +3,23 @@ |
||
3 | 3 | namespace Spatie\MediaLibrary\Models; |
4 | 4 | |
5 | 5 | use DateTimeInterface; |
6 | -use Illuminate\Support\Collection; |
|
7 | -use Illuminate\Support\HtmlString; |
|
8 | -use Spatie\MediaLibrary\Helpers\File; |
|
9 | -use Illuminate\Database\Eloquent\Model; |
|
10 | 6 | use Illuminate\Contracts\Support\Htmlable; |
11 | -use Spatie\MediaLibrary\HasMedia\HasMedia; |
|
12 | 7 | use Illuminate\Contracts\Support\Responsable; |
8 | +use Illuminate\Database\Eloquent\Model; |
|
9 | +use Illuminate\Database\Eloquent\Relations\MorphTo; |
|
10 | +use Illuminate\Support\Collection; |
|
11 | +use Illuminate\Support\HtmlString; |
|
13 | 12 | use Spatie\MediaLibrary\Conversion\Conversion; |
13 | +use Spatie\MediaLibrary\Conversion\ConversionCollection; |
|
14 | 14 | use Spatie\MediaLibrary\Filesystem\Filesystem; |
15 | -use Spatie\MediaLibrary\Models\Concerns\IsSorted; |
|
16 | -use Illuminate\Database\Eloquent\Relations\MorphTo; |
|
15 | +use Spatie\MediaLibrary\HasMedia\HasMedia; |
|
16 | +use Spatie\MediaLibrary\Helpers\File; |
|
17 | 17 | use Spatie\MediaLibrary\Helpers\TemporaryDirectory; |
18 | -use Spatie\MediaLibrary\Conversion\ConversionCollection; |
|
19 | 18 | use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image; |
20 | -use Spatie\MediaLibrary\UrlGenerator\UrlGeneratorFactory; |
|
19 | +use Spatie\MediaLibrary\Models\Concerns\IsSorted; |
|
21 | 20 | use Spatie\MediaLibrary\Models\Traits\CustomMediaProperties; |
22 | 21 | use Spatie\MediaLibrary\ResponsiveImages\RegisteredResponsiveImages; |
22 | +use Spatie\MediaLibrary\UrlGenerator\UrlGeneratorFactory; |
|
23 | 23 | |
24 | 24 | class Media extends Model implements Responsable, Htmlable |
25 | 25 | { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | |
157 | 157 | /** |
158 | 158 | * @param string $name |
159 | - * @param mixed $value |
|
159 | + * @param boolean $value |
|
160 | 160 | * |
161 | 161 | * @return $this |
162 | 162 | */ |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * |
219 | 219 | * @param \Illuminate\Http\Request $request |
220 | 220 | * |
221 | - * @return \Illuminate\Http\Response |
|
221 | + * @return \Symfony\Component\HttpFoundation\StreamedResponse |
|
222 | 222 | */ |
223 | 223 | public function toResponse($request) |
224 | 224 | { |
@@ -2,21 +2,21 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary; |
4 | 4 | |
5 | -use Storage; |
|
6 | -use Illuminate\Support\Facades\File; |
|
7 | -use Spatie\MediaLibrary\Models\Media; |
|
8 | 5 | use Illuminate\Contracts\Bus\Dispatcher; |
9 | -use Spatie\MediaLibrary\Helpers\ImageFactory; |
|
6 | +use Illuminate\Support\Facades\File; |
|
10 | 7 | use Spatie\MediaLibrary\Conversion\Conversion; |
11 | -use Spatie\MediaLibrary\Filesystem\Filesystem; |
|
12 | -use Spatie\MediaLibrary\Jobs\PerformConversions; |
|
13 | -use Spatie\MediaLibrary\Events\ConversionWillStart; |
|
14 | -use Spatie\MediaLibrary\Helpers\TemporaryDirectory; |
|
15 | -use Spatie\MediaLibrary\ImageGenerators\ImageGenerator; |
|
16 | 8 | use Spatie\MediaLibrary\Conversion\ConversionCollection; |
17 | 9 | use Spatie\MediaLibrary\Events\ConversionHasBeenCompleted; |
10 | +use Spatie\MediaLibrary\Events\ConversionWillStart; |
|
11 | +use Spatie\MediaLibrary\Filesystem\Filesystem; |
|
18 | 12 | use Spatie\MediaLibrary\Helpers\File as MediaLibraryFileHelper; |
13 | +use Spatie\MediaLibrary\Helpers\ImageFactory; |
|
14 | +use Spatie\MediaLibrary\Helpers\TemporaryDirectory; |
|
15 | +use Spatie\MediaLibrary\ImageGenerators\ImageGenerator; |
|
16 | +use Spatie\MediaLibrary\Jobs\PerformConversions; |
|
17 | +use Spatie\MediaLibrary\Models\Media; |
|
19 | 18 | use Spatie\MediaLibrary\ResponsiveImages\ResponsiveImageGenerator; |
19 | +use Storage; |
|
20 | 20 | |
21 | 21 | class FileManipulator |
22 | 22 | { |
@@ -2,18 +2,18 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\ResponsiveImages; |
4 | 4 | |
5 | -use Spatie\MediaLibrary\Helpers\File; |
|
6 | -use Spatie\MediaLibrary\Models\Media; |
|
7 | 5 | use Illuminate\Support\Facades\Storage; |
8 | -use Spatie\MediaLibrary\Helpers\ImageFactory; |
|
9 | 6 | use Spatie\MediaLibrary\Conversion\Conversion; |
7 | +use Spatie\MediaLibrary\Events\ResponsiveImagesGenerated; |
|
10 | 8 | use Spatie\MediaLibrary\Filesystem\Filesystem; |
9 | +use Spatie\MediaLibrary\Helpers\File; |
|
10 | +use Spatie\MediaLibrary\Helpers\ImageFactory; |
|
11 | 11 | use Spatie\MediaLibrary\Helpers\TemporaryDirectory; |
12 | -use Spatie\MediaLibrary\Events\ResponsiveImagesGenerated; |
|
12 | +use Spatie\MediaLibrary\Models\Media; |
|
13 | 13 | use Spatie\MediaLibrary\ResponsiveImages\Exceptions\InvalidTinyJpg; |
14 | +use Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator; |
|
14 | 15 | use Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\WidthCalculator; |
15 | 16 | use Spatie\TemporaryDirectory\TemporaryDirectory as BaseTemporaryDirectory; |
16 | -use Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\TinyPlaceholderGenerator; |
|
17 | 17 | |
18 | 18 | class ResponsiveImageGenerator |
19 | 19 | { |