Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

recreate BackedEnums when applying Manipulations #3584

Merged
merged 5 commits into from
May 24, 2024
Merged

recreate BackedEnums when applying Manipulations #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56fa21d
recreate BackedEnums when applying Manipulations
tkempf Apr 16, 2024
ec8f1a8
Recreate all Enums which are set independant from manipulation
tkempf Apr 16, 2024
97b92d9
Add Test for FileAdder with Manipulations using Enum Parameters
tkempf Apr 16, 2024
affa386
Revert "Recreate all Enums which are set independant from manipulation"
tkempf Apr 19, 2024
152d9d2
Use match operator to check for type of manipulation
tkempf Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/Conversions/Manipulations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
namespace Spatie\MediaLibrary\Conversions;

use Spatie\Image\Drivers\ImageDriver;
use Spatie\Image\Enums\BorderType;
use Spatie\Image\Enums\AlignPosition;
use Spatie\Image\Enums\ColorFormat;
use Spatie\Image\Enums\Constraint;
use Spatie\Image\Enums\CropPosition;
use Spatie\Image\Enums\Fit;
use Spatie\Image\Enums\FlipDirection;


/** @mixin \Spatie\Image\Drivers\ImageDriver */
class Manipulations
Expand Down Expand Up @@ -52,6 +60,17 @@ public function isEmpty(): bool
public function apply(ImageDriver $image): void
{
foreach ($this->manipulations as $manipulationName => $parameters) {
match($manipulationName){
'border' => (isset($parameters['type'])) && $parameters['type'] = BorderType::from($parameters['type']),
'watermark' => (isset($parameters['fit'])) && $parameters['fit'] = Fit::from($parameters['fit']),
'watermark','resizeCanvas','insert' => (isset($parameters['position'])) && $parameters['position'] = AlignPosition::from($parameters['position']),
'pickColor' => (isset($parameters['colorFormat'])) && $parameters['colorFormat'] = ColorFormat::from($parameters['colorFormat']),
'resize','width','height' => (isset($parameters['constraints'])) && $parameters['constraints'] = Constraint::from($parameters['constraints']),
'crop' => (isset($parameters['position'])) && $parameters['position'] = CropPosition::from($parameters['position']),
'fit' => (isset($parameters['fit'])) && $parameters['fit'] = Fit::from($parameters['fit']),
'flip' => (isset($parameters['flip'])) && $parameters['flip'] = FlipDirection::from($parameters['flip']),
default => ''
};
$image->$manipulationName(...$parameters);
}
}
Expand Down
13 changes: 13 additions & 0 deletions tests/Feature/FileAdder/IntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Spatie\MediaLibrary\MediaCollections\Models\Media;
use Spatie\MediaLibrary\Tests\TestSupport\RenameOriginalFileNamer;
use Spatie\MediaLibrary\Tests\TestSupport\TestModels\TestModel;
use Spatie\Image\Enums\BorderType;
use Symfony\Component\HttpFoundation\File\UploadedFile;

it('can add an file to the default collection', function () {
Expand Down Expand Up @@ -451,6 +452,18 @@
expect($media->manipulations['thumb']['width'])->toEqual(['10']);
});

it('can add manipulations with parameters of type Enum to the saved media', function () {
$media = $this->testModelWithConversion
->addMedia($this->getTestJpg())
->preservingOriginal()
->withManipulations(['thumb' => [
'background' => ['color'=>'ffffff'],
'border' =>['width'=>15, 'type'=>BorderType::Shrink, 'color'=>'000000']
]
])
->toMediaCollection();
})->throwsNoExceptions();

it('can add file to model with morph map', function () {
$media = $this->testModelWithMorphMap
->addMedia($this->getTestJpg())
Expand Down