joby/image-transform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update ImagickCLIDriver.php

Browse source 
configurable mogrify path, exceptions on exec() error
This commit is contained in:
Joby Elliott 2020-10-16 14:01:00 -06:00 committed by GitHub
parent ff7b5a0c6e
commit a92ab71dfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Drivers/ImagickCLIDriver.php
View file

@ -13,11 +13,17 @@ use ByJoby\ImageTransform\Image;
*/ */
class ImagickCLIDriver extends AbstractCLIDriver class ImagickCLIDriver extends AbstractCLIDriver
{ {
const MOGRIFY_EXECUTABLE = 'magick mogrify'; protected $mogrify_executable;
public function __construct($mogrify_executable = 'magick mogrify')
{
parent::__construct();
$this->mogrify_executable = $mogrify_executable;
}
protected function mogrifyExecutable(): string protected function mogrifyExecutable(): string
{ {
return static::MOGRIFY_EXECUTABLE; return $this->mogrify_executable;
} }
protected function doSave(Image $image, string $filename) protected function doSave(Image $image, string $filename)
@ -51,7 +57,10 @@ class ImagickCLIDriver extends AbstractCLIDriver
copy($image->source(), $tempFile); copy($image->source(), $tempFile);
// execute command and copy result // execute command and copy result
$command[] = '"' . $tempFile . '"'; $command[] = '"' . $tempFile . '"';
exec(implode(' ', $command)); exec(implode(' ', $command), $output, $return);
if ($return) {
throw new \Exception("Imagick CLI call failed, returned " . $return);
}
copy($tempFile, $filename); copy($tempFile, $filename);
} }
} }