Skip to content

Commit 23cae7c

Browse files
committed
remove state enum
1 parent 7517ef9 commit 23cae7c

File tree

5 files changed

+22
-25
lines changed

5 files changed

+22
-25
lines changed

database/factories/MediaFactory.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Finller\LaravelMedia\Database\Factories;
44

55
use Finller\LaravelMedia\Casts\GeneratedConversion;
6-
use Finller\LaravelMedia\Enums\GeneratedConversionState;
76
use Finller\LaravelMedia\Enums\MediaType;
87
use Finller\LaravelMedia\Media;
98
use Illuminate\Database\Eloquent\Factories\Factory;
@@ -28,15 +27,15 @@ public function definition()
2827
public static function generatedConversion()
2928
{
3029
return new GeneratedConversion(
31-
state: GeneratedConversionState::Success,
30+
state: 'success',
3231
type: MediaType::Image,
3332
file_name: 'poster.png',
3433
name: 'poster',
3534
path: '/poster/poster.png',
3635
disk: config('media.disk'),
3736
conversions: collect([
3837
'480p' => new GeneratedConversion(
39-
state: GeneratedConversionState::Success,
38+
state: 'success',
4039
type: MediaType::Image,
4140
file_name: 'poster-480p.png',
4241
name: 'poster-480p',

src/Casts/GeneratedConversion.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Finller\LaravelMedia\Casts;
44

5-
use Finller\LaravelMedia\Enums\GeneratedConversionState;
65
use Finller\LaravelMedia\Enums\MediaType;
76
use Illuminate\Contracts\Support\Arrayable;
87
use Illuminate\Support\Arr;
@@ -26,7 +25,7 @@ public function __construct(
2625
public ?int $width = null,
2726
public ?float $aspect_ratio = null,
2827
public ?string $average_color = null,
29-
public GeneratedConversionState $state = GeneratedConversionState::Pending,
28+
public ?string $state = null,
3029
public Collection $conversions = new Collection()
3130
) {
3231
}
@@ -36,7 +35,7 @@ public static function make(array $attributes): self
3635
return new self(
3736
file_name: Arr::get($attributes, 'file_name'),
3837
name: Arr::get($attributes, 'name'),
39-
state: GeneratedConversionState::from(Arr::get($attributes, 'state')),
38+
state: Arr::get($attributes, 'state'),
4039
type: ($type = Arr::get($attributes, 'type')) ? MediaType::from($type) : MediaType::Other,
4140
disk: Arr::get($attributes, 'disk'),
4241
path: Arr::get($attributes, 'path'),

src/Enums/GeneratedConversionState.php

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/Media.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Finller\LaravelMedia\Casts\GeneratedConversion;
66
use Finller\LaravelMedia\Casts\GeneratedConversions;
7-
use Finller\LaravelMedia\Enums\GeneratedConversionState;
87
use Finller\LaravelMedia\Enums\MediaType;
98
use Finller\LaravelMedia\Helpers\File;
109
use Finller\LaravelMedia\Traits\HasUuid;
@@ -208,7 +207,7 @@ public function storeConversion(
208207
path: ($basePath ?? $this->generateBasePath($conversion)).$file_name,
209208
mime_type: $mime_type,
210209
type: $type,
211-
state: GeneratedConversionState::Success,
210+
state: 'success',
212211
disk: $this->disk,
213212
height: $dimension?->getHeight(),
214213
width: $dimension->getWidth(),

tests/Feature/MediaTest.php

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
use FFMpeg\Coordinate\Dimension;
44
use Finller\LaravelMedia\Casts\GeneratedConversion;
55
use Finller\LaravelMedia\Database\Factories\MediaFactory;
6-
use Finller\LaravelMedia\Enums\GeneratedConversionState;
76
use Finller\LaravelMedia\Enums\MediaType;
87
use Finller\LaravelMedia\Media;
98
use Illuminate\Http\UploadedFile;
109
use Illuminate\Support\Facades\Storage;
1110

12-
it('retrieve the correct generated conversion key', function () {
11+
it('retrieve the generated conversion key', function () {
1312
/** @var Media $media */
1413
$media = MediaFactory::new()->make();
1514

@@ -18,7 +17,7 @@
1817
expect($media->getConversionKey('poster.square.480p'))->toBe('poster.conversions.square.conversions.480p');
1918
});
2019

21-
it('retrieve the correct generated conversion', function () {
20+
it('retrieve the generated conversion', function () {
2221
/** @var Media $media */
2322
$media = MediaFactory::new()->make();
2423

@@ -35,7 +34,7 @@
3534
expect($media->getGeneratedConversion('poster.480p.foo'))->toBe(null);
3635
});
3736

38-
it('retrieve the correct generated conversion path', function () {
37+
it('retrieve the generated conversion path', function () {
3938
/** @var Media $media */
4039
$media = MediaFactory::new()->make();
4140

@@ -47,7 +46,7 @@
4746
expect($media->getPath('poster.480p'))->toBe('/poster/conversions/480p/poster-480p.png');
4847
});
4948

50-
it('add the correct generated conversion', function () {
49+
it('add the generated conversion', function () {
5150

5251
/** @var Media $media */
5352
$media = MediaFactory::new()->make();
@@ -59,7 +58,7 @@
5958
$media->addGeneratedConversion('optimized', new GeneratedConversion(
6059
file_name: 'optimized.png',
6160
name: 'optimized',
62-
state: GeneratedConversionState::Pending,
61+
state: 'pending',
6362
path: '/optimized/optimized.png',
6463
type: MediaType::Image,
6564
disk: config('media.disk')
@@ -68,7 +67,7 @@
6867
$media->addGeneratedConversion('poster-optimized', new GeneratedConversion(
6968
file_name: 'poster-optimized.png',
7069
name: 'poster-optimized',
71-
state: GeneratedConversionState::Pending,
70+
state: 'pending',
7271
path: 'poster/conversions/optimized/poster-optimized.png',
7372
type: MediaType::Image,
7473
disk: config('media.disk')
@@ -78,6 +77,17 @@
7877
expect($media->hasGeneratedConversion('poster.poster-optimized'))->toBe(true);
7978
});
8079

80+
it('update a conversion', function () {
81+
/** @var Media $media */
82+
$media = MediaFactory::new()->make();
83+
84+
$media->generated_conversions = collect([
85+
'poster' => MediaFactory::generatedConversion(),
86+
]);
87+
88+
expect($media->getGeneratedConversion('poster')?->state)->tobe('success');
89+
});
90+
8191
it('store an uploaded image', function () {
8292
/** @var Media $media */
8393
$media = MediaFactory::new()->make();

0 commit comments

Comments
 (0)