@@ -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 |
@@ -32,6 +32,9 @@ |
||
| 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); |
@@ -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,17 +2,17 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Spatie\MediaLibrary\ResponsiveImages; |
| 4 | 4 | |
| 5 | -use Spatie\MediaLibrary\Helpers\File; |
|
| 6 | -use Spatie\MediaLibrary\Models\Media; |
|
| 7 | -use Spatie\MediaLibrary\Helpers\ImageFactory; |
|
| 8 | 5 | use Spatie\MediaLibrary\Conversion\Conversion; |
| 6 | +use Spatie\MediaLibrary\Events\ResponsiveImagesGenerated; |
|
| 9 | 7 | use Spatie\MediaLibrary\Filesystem\Filesystem; |
| 8 | +use Spatie\MediaLibrary\Helpers\File; |
|
| 9 | +use Spatie\MediaLibrary\Helpers\ImageFactory; |
|
| 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 | { |
@@ -3,26 +3,26 @@ |
||
| 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; |
| 13 | -use Spatie\MediaLibrary\Conversion\Conversion; |
|
| 14 | -use Spatie\MediaLibrary\Filesystem\Filesystem; |
|
| 15 | -use Spatie\MediaLibrary\Models\Concerns\IsSorted; |
|
| 8 | +use Illuminate\Database\Eloquent\Model; |
|
| 16 | 9 | use Illuminate\Database\Eloquent\Relations\MorphTo; |
| 17 | -use Spatie\MediaLibrary\FileAdder\FileAdderFactory; |
|
| 18 | -use Spatie\MediaLibrary\Helpers\TemporaryDirectory; |
|
| 10 | +use Illuminate\Support\Collection; |
|
| 11 | +use Illuminate\Support\HtmlString; |
|
| 12 | +use Spatie\MediaLibrary\Conversion\Conversion; |
|
| 19 | 13 | use Spatie\MediaLibrary\Conversion\ConversionCollection; |
| 20 | 14 | use Spatie\MediaLibrary\Events\CollectionHasBeenCleared; |
| 15 | +use Spatie\MediaLibrary\FileAdder\FileAdderFactory; |
|
| 16 | +use Spatie\MediaLibrary\Filesystem\Filesystem; |
|
| 17 | +use Spatie\MediaLibrary\HasMedia\HasMedia; |
|
| 18 | +use Spatie\MediaLibrary\Helpers\File; |
|
| 19 | +use Spatie\MediaLibrary\Helpers\TemporaryDirectory; |
|
| 21 | 20 | use Spatie\MediaLibrary\ImageGenerators\FileTypes\Image; |
| 22 | 21 | use Spatie\MediaLibrary\MediaCollection\MediaCollection; |
| 23 | -use Spatie\MediaLibrary\UrlGenerator\UrlGeneratorFactory; |
|
| 22 | +use Spatie\MediaLibrary\Models\Concerns\IsSorted; |
|
| 24 | 23 | use Spatie\MediaLibrary\Models\Traits\CustomMediaProperties; |
| 25 | 24 | use Spatie\MediaLibrary\ResponsiveImages\RegisteredResponsiveImages; |
| 25 | +use Spatie\MediaLibrary\UrlGenerator\UrlGeneratorFactory; |
|
| 26 | 26 | |
| 27 | 27 | class Media extends Model implements Responsable, Htmlable |
| 28 | 28 | { |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | /** |
| 74 | 74 | * Clear the media's entire media collection. |
| 75 | 75 | * |
| 76 | - * @param null $model |
|
| 77 | - * @param \Spatie\MediaLibrary\Models\Media[]|\Illuminate\Support\Collection $excludedMedia |
|
| 76 | + * @param HasMedia|null $model |
|
| 77 | + * @param Media $excludedMedia |
|
| 78 | 78 | * @return $this |
| 79 | 79 | */ |
| 80 | 80 | public function clearMediaCollection($model = null, $excludedMedia = []) |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | /** |
| 142 | 142 | * Register global media conversions. |
| 143 | 143 | * |
| 144 | - * @param Media|null $media |
|
| 144 | + * @param null|\self $media |
|
| 145 | 145 | * @return void |
| 146 | 146 | */ |
| 147 | 147 | public function registerMediaConversions(self $media = null) |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | |
| 343 | 343 | /** |
| 344 | 344 | * @param string $name |
| 345 | - * @param mixed $value |
|
| 345 | + * @param boolean $value |
|
| 346 | 346 | * |
| 347 | 347 | * @return $this |
| 348 | 348 | */ |