Merge pull request #14 from seltix5/master

Option to halt processing of failed optimisation, or continue processing command chain.

src/PHPImageOptim/PHPImageOptim.php

@@ -44,8 +44,10 @@ public function chainCommand($object): PHPImageOptim
     /**
      * @return bool
      */
-    public function optimise(): bool
+    public function optimise($stopIfFail = true): bool
     {
+        $this->stopIfFail = $stopIfFail;
+
         foreach ($this->chainedCommands as $chainedCommand) {
             $chainedCommand->determinePreOptimisedFileSize();
             $chainedCommand->setImagePath($this->imagePath);

src/PHPImageOptim/Tools/Common.php

@@ -12,6 +12,7 @@ class Common
     protected $originalFileSize = '';
     protected $finalFileSize = '';
     protected $optimisationLevel = 1;
+    protected $stopIfFail = true;
 
     /**
      * @param string $binaryPath

src/PHPImageOptim/Tools/Gif/Gifsicle.php

@@ -15,7 +15,7 @@ class Gifsicle extends Common implements ToolsInterface
     public function optimise(): ToolsInterface
     {
         exec($this->binaryPath . ' -b -O2 ' . escapeshellarg($this->imagePath), $aOutput, $iResult);
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('GIFSICLE was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
 

src/PHPImageOptim/Tools/Jpeg/Guetzli.php

@@ -45,7 +45,7 @@ public function optimise(): ToolsInterface
             $iResult
         );
 
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('GUETZLI was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
         return $this;

src/PHPImageOptim/Tools/Jpeg/JpegOptim.php

@@ -15,7 +15,7 @@ class JpegOptim extends Common implements ToolsInterface
     public function optimise(): ToolsInterface
     {
         exec($this->binaryPath . ' --strip-all --all-progressive ' . escapeshellarg($this->imagePath), $aOutput, $iResult);
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('JPEGOPTIM was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
 

src/PHPImageOptim/Tools/Jpeg/JpegTran.php

@@ -15,7 +15,7 @@ class JpegTran extends Common implements ToolsInterface
     public function optimise(): ToolsInterface
     {
         exec($this->binaryPath . ' -optimize ' . escapeshellarg($this->imagePath), $aOutput, $iResult);
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('JPEGTRAN was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
 

src/PHPImageOptim/Tools/Jpeg/MozJpeg.php

@@ -47,7 +47,7 @@ public function optimise(): ToolsInterface
 
         rename($tempFile, $this->imagePath);
 
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('MOZJPEG was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
         return $this;

src/PHPImageOptim/Tools/Png/AdvPng.php

@@ -15,7 +15,7 @@ class AdvPng extends Common implements ToolsInterface
     public function optimise(): ToolsInterface
     {
         exec($this->binaryPath . ' -z -4 -i20 -- ' . escapeshellarg($this->imagePath), $aOutput, $iResult);
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('ADVPNG was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
 

src/PHPImageOptim/Tools/Png/OptiPng.php

@@ -15,7 +15,7 @@ class OptiPng extends Common implements ToolsInterface
     public function optimise(): ToolsInterface
     {
         exec($this->binaryPath . ' -i0 -o7 -zm1-9 ' . escapeshellarg($this->imagePath), $aOutput, $iResult);
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('OPTIPNG was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
 

src/PHPImageOptim/Tools/Png/PngCrush.php

@@ -24,7 +24,7 @@ public function optimise(): ToolsInterface
         // Switch back to previous directory
         chdir($prevDir);
 
-        if ($iResult != 0) {
+        if ($this->stopIfFail && $iResult != 0) {
             throw new Exception('PNGCRUSH was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
 

src/PHPImageOptim/Tools/Png/PngOut.php

@@ -20,7 +20,7 @@ public function optimise(): ToolsInterface
             return $this;
         }
 
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('PNGOUT was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }
 

src/PHPImageOptim/Tools/Png/PngQuant.php

@@ -15,7 +15,7 @@ class PngQuant extends Common implements ToolsInterface
     public function optimise(): ToolsInterface
     {
         exec($this->binaryPath . ' --speed 1 --ext=.png --force ' . escapeshellarg($this->imagePath), $aOutput, $iResult);
-        if ($iResult !== 0) {
+        if ($this->stopIfFail && $iResult !== 0) {
             throw new Exception('PNGQUANT was unable to optimise image, result:' . $iResult . ' File: ' . $this->imagePath);
         }