@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\UrlGenerator; |
4 | 4 | |
5 | -use Spatie\MediaLibrary\Models\Media; |
|
6 | -use Spatie\MediaLibrary\Exceptions\InvalidUrlGenerator; |
|
7 | 5 | use Spatie\MediaLibrary\Conversion\ConversionCollection; |
6 | +use Spatie\MediaLibrary\Exceptions\InvalidUrlGenerator; |
|
7 | +use Spatie\MediaLibrary\Models\Media; |
|
8 | 8 | use Spatie\MediaLibrary\PathGenerator\PathGeneratorFactory; |
9 | 9 | |
10 | 10 | class UrlGeneratorFactory |
@@ -2,12 +2,12 @@ |
||
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\Image\Manipulations; |
|
7 | 7 | use Illuminate\Support\Collection; |
8 | -use Spatie\MediaLibrary\Models\Media; |
|
9 | -use Illuminate\Database\Eloquent\Relations\Relation; |
|
8 | +use Spatie\Image\Manipulations; |
|
10 | 9 | use Spatie\MediaLibrary\Exceptions\InvalidConversion; |
10 | +use Spatie\MediaLibrary\Models\Media; |
|
11 | 11 | |
12 | 12 | class ConversionCollection extends Collection |
13 | 13 | { |
@@ -47,7 +47,7 @@ |
||
47 | 47 | * |
48 | 48 | * @param string $name |
49 | 49 | * |
50 | - * @return mixed |
|
50 | + * @return Conversion |
|
51 | 51 | * |
52 | 52 | * @throws \Spatie\MediaLibrary\Exceptions\InvalidConversion |
53 | 53 | */ |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\Exceptions\FileCannotBeAdded; |
4 | 4 | |
5 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded; |
|
5 | 6 | use Spatie\MediaLibrary\File; |
6 | 7 | use Spatie\MediaLibrary\HasMedia\HasMedia; |
7 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded; |
|
8 | 8 | use Spatie\MediaLibrary\MediaCollection\MediaCollection; |
9 | 9 | |
10 | 10 | class FileUnacceptableForCollection extends FileCannotBeAdded |
@@ -2,22 +2,22 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\FileAdder; |
4 | 4 | |
5 | -use Spatie\MediaLibrary\Helpers\File; |
|
6 | -use Spatie\MediaLibrary\Models\Media; |
|
7 | 5 | use Illuminate\Database\Eloquent\Model; |
8 | -use Spatie\MediaLibrary\HasMedia\HasMedia; |
|
6 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\DiskDoesNotExist; |
|
7 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileDoesNotExist; |
|
8 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileIsTooBig; |
|
9 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileUnacceptableForCollection; |
|
10 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnknownType; |
|
9 | 11 | use Spatie\MediaLibrary\File as PendingFile; |
10 | 12 | use Spatie\MediaLibrary\Filesystem\Filesystem; |
13 | +use Spatie\MediaLibrary\HasMedia\HasMedia; |
|
14 | +use Spatie\MediaLibrary\Helpers\File; |
|
15 | +use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image as ImageGenerator; |
|
11 | 16 | use Spatie\MediaLibrary\Jobs\GenerateResponsiveImages; |
12 | -use Symfony\Component\HttpFoundation\File\UploadedFile; |
|
13 | 17 | use Spatie\MediaLibrary\MediaCollection\MediaCollection; |
18 | +use Spatie\MediaLibrary\Models\Media; |
|
14 | 19 | use Symfony\Component\HttpFoundation\File\File as SymfonyFile; |
15 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnknownType; |
|
16 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileIsTooBig; |
|
17 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\DiskDoesNotExist; |
|
18 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileDoesNotExist; |
|
19 | -use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image as ImageGenerator; |
|
20 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\FileUnacceptableForCollection; |
|
20 | +use Symfony\Component\HttpFoundation\File\UploadedFile; |
|
21 | 21 | |
22 | 22 | class FileAdder |
23 | 23 | { |
@@ -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 | { |
@@ -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,13 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\Filesystem; |
4 | 4 | |
5 | +use Illuminate\Contracts\Filesystem\Factory; |
|
5 | 6 | use Illuminate\Support\Str; |
7 | +use Spatie\MediaLibrary\Conversion\ConversionCollection; |
|
8 | +use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
9 | +use Spatie\MediaLibrary\FileManipulator; |
|
6 | 10 | use Spatie\MediaLibrary\Helpers\File; |
7 | 11 | use Spatie\MediaLibrary\Models\Media; |
8 | -use Spatie\MediaLibrary\FileManipulator; |
|
9 | -use Illuminate\Contracts\Filesystem\Factory; |
|
10 | -use Spatie\MediaLibrary\Events\MediaHasBeenAdded; |
|
11 | -use Spatie\MediaLibrary\Conversion\ConversionCollection; |
|
12 | 12 | use Spatie\MediaLibrary\PathGenerator\PathGeneratorFactory; |
13 | 13 | |
14 | 14 | class Filesystem |
@@ -2,17 +2,17 @@ |
||
2 | 2 | |
3 | 3 | namespace Spatie\MediaLibrary\Commands; |
4 | 4 | |
5 | -use Illuminate\Support\Str; |
|
6 | 5 | use Illuminate\Console\Command; |
7 | -use Spatie\MediaLibrary\Models\Media; |
|
8 | 6 | use Illuminate\Console\ConfirmableTrait; |
9 | -use Spatie\MediaLibrary\FileManipulator; |
|
10 | -use Spatie\MediaLibrary\MediaRepository; |
|
11 | 7 | use Illuminate\Contracts\Filesystem\Factory; |
12 | 8 | use Illuminate\Database\Eloquent\Collection; |
9 | +use Illuminate\Support\Str; |
|
13 | 10 | use Spatie\MediaLibrary\Conversion\Conversion; |
14 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded; |
|
15 | 11 | use Spatie\MediaLibrary\Conversion\ConversionCollection; |
12 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded; |
|
13 | +use Spatie\MediaLibrary\FileManipulator; |
|
14 | +use Spatie\MediaLibrary\MediaRepository; |
|
15 | +use Spatie\MediaLibrary\Models\Media; |
|
16 | 16 | use Spatie\MediaLibrary\PathGenerator\BasePathGenerator; |
17 | 17 | use Spatie\MediaLibrary\ResponsiveImages\RegisteredResponsiveImages; |
18 | 18 |
@@ -3,24 +3,24 @@ |
||
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 | 8 | use Illuminate\Support\Arr; |
8 | -use Illuminate\Support\Str; |
|
9 | 9 | use Illuminate\Support\Collection; |
10 | -use Spatie\MediaLibrary\Models\Media; |
|
11 | -use Spatie\MediaLibrary\MediaRepository; |
|
12 | 10 | use Illuminate\Support\Facades\Validator; |
13 | -use Spatie\MediaLibrary\FileAdder\FileAdder; |
|
14 | -use Illuminate\Database\Eloquent\SoftDeletes; |
|
11 | +use Illuminate\Support\Str; |
|
15 | 12 | use Spatie\MediaLibrary\Conversion\Conversion; |
16 | -use Spatie\MediaLibrary\FileAdder\FileAdderFactory; |
|
17 | 13 | use Spatie\MediaLibrary\Events\CollectionHasBeenCleared; |
14 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\InvalidBase64Data; |
|
15 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\MimeTypeNotAllowed; |
|
16 | +use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnreachableUrl; |
|
18 | 17 | use Spatie\MediaLibrary\Exceptions\MediaCannotBeDeleted; |
19 | 18 | use Spatie\MediaLibrary\Exceptions\MediaCannotBeUpdated; |
19 | +use Spatie\MediaLibrary\FileAdder\FileAdder; |
|
20 | +use Spatie\MediaLibrary\FileAdder\FileAdderFactory; |
|
20 | 21 | use Spatie\MediaLibrary\MediaCollection\MediaCollection; |
21 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\UnreachableUrl; |
|
22 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\InvalidBase64Data; |
|
23 | -use Spatie\MediaLibrary\Exceptions\FileCannotBeAdded\MimeTypeNotAllowed; |
|
22 | +use Spatie\MediaLibrary\MediaRepository; |
|
23 | +use Spatie\MediaLibrary\Models\Media; |
|
24 | 24 | |
25 | 25 | trait HasMediaTrait |
26 | 26 | { |