Skip to content

Take the extension from options into account when saving the image #9

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

Closed
mjauvin wants to merge 4 commits into from
Closed

Take the extension from options into account when saving the image #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17a9d0c
take the extension options extension attribute into account
mjauvin Dec 4, 2020
1f877b0
add getExtension() method and a testcase to test its behavior
mjauvin Dec 4, 2020
ba1b865
use gif for test file as there is no jpeg/jpg ambiguity
mjauvin Dec 4, 2020
d769f98
Merge branch 'develop' into use-extension-for-type-conversion
mjauvin Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Database/Attach/Resizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ public function save($savePath)
}

// Determine the image type from the destination file
$extension = pathinfo($savePath, PATHINFO_EXTENSION) ?: $this->extension;
$extension = $this->getExtension($savePath);

// Create and save an image based on it's extension
switch (strtolower($extension)) {
Expand Down Expand Up @@ -686,4 +686,9 @@ protected function getSizeByFit($maxWidth, $maxHeight)

return [$optimalWidth, $optimalHeight];
}

protected function getExtension($path)
{
return $this->getOption('extension') ?: (pathinfo($path, PATHINFO_EXTENSION) ?: $this->extension);
}
}
19 changes: 19 additions & 0 deletions tests/Database/Attach/ResizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,25 @@ public function testCrop10x15()
$this->assertImageSameAsFixture(__METHOD__);
}

public function testGetExtension()
{
$this->setSource(self::SRC_PORTRAIT); // gif extension
$this->createFixtureResizer();

// no extension provided in path, no extension provided in options, should return source extension.
$extension = $this->callProtectedMethod($this->resizer, 'getExtension', ['dummy']);
$this->assertEquals('gif', $extension);

// no extension provided in options, extension provided in path, should return path extension
$extension = $this->callProtectedMethod($this->resizer, 'getExtension', ['dummy.jpg']);
$this->assertEquals('jpg', $extension);

// extension provided in options and in path, should return extension from options
$this->resizer->setOptions(['extension' => 'png']);
$extension = $this->callProtectedMethod($this->resizer, 'getExtension', ['dummy.jpg']);
$this->assertEquals('png', $extension);
}

/**
* Set the source path and set the extension to match.
* @param string $source Path to the source image for the Resizer
Expand Down