Add gifsicle to optimize GIFs

Author: quazardous

Diff for: composer.json

@@ -9,7 +9,8 @@
         "doctrine/cache": "^1.6"
     },
     "require-dev": {
-        "ext-gd": "*"
+        "ext-gd": "*",
+        "phpunit/phpunit": "^5.0"
     },
     "autoload": {
         "psr-0": {

Diff for: phpunit.xml

@@ -1,27 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="tests/bootstrap.php"
-         cacheTokens="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         printerClass="PHPUnit_TextUI_ResultPrinter"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         stopOnRisky="false"
-         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
-         timeoutForSmallTests="1"
-         timeoutForMediumTests="10"
-         timeoutForLargeTests="60"
-         verbose="false">
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.7/phpunit.xsd"
+         bootstrap="tests/bootstrap.php">
     <testsuites>
         <testsuite name="ImageStack Tests Suite">
             <file>tests/ImagePathTests.php</file>

Diff for: src/ImageStack/ImageOptimizer/GifsicleImageOptimizer.php

@@ -0,0 +1,77 @@
+<?php
+namespace ImageStack\ImageOptimizer;
+
+use ImageStack\ImageOptimizer\Exception\ImageOptimizerException;
+
+/**
+ * Gifsicle image optimizer.
+ */
+class GifsicleImageOptimizer extends AbstractExternalImageOptimizer
+{
+
+    /**
+     * {@inheritDoc}
+     * @see \ImageStack\ImageOptimizer\ImageOptimizerInterface::getSupportedMimeTypes()
+     */
+    public function getSupportedMimeTypes()
+    {
+        return [
+            'image/gif',
+        ];
+    }
+    
+    /**
+     * {@inheritDoc}
+     * @see \ImageStack\ImageOptimizer\AbstractExternalImageOptimizer::getInputFileExtension()
+     */
+    protected function getInputFileExtension()
+    {
+        return 'gif';
+    }
+    
+    /**
+     * Return the output file extension.
+     * @return string
+     */
+    protected function getOutputFileExtension()
+    {
+        return 'gif';
+    }
+    
+    /**
+     * {@inheritDoc}
+     * @see \ImageStack\ImageOptimizer\AbstractExternalImageOptimizer::checkIsMimeTypeSupported()
+     */
+    protected function checkIsMimeTypeSupported($mimeType)
+    {
+        return 'image/gif' == $mimeType;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @see \ImageStack\ImageOptimizer\AbstractExternalImageOptimizer::execExternalOptimizer()
+     */
+	protected function execExternalOptimizer($if, &$binaryContent)
+	{
+	    $of = $this->getTempnam("of", $this->getOutputFileExtension());
+	    $cmd = [
+	        $this->getOption('gifsicle', 'gifsicle'),
+	        $this->getOption('gifsicle_options', '-O3'),
+	        $if,
+	        '-o',
+	        $of,
+	    ];
+	    $output = [];
+	    $ret = null;
+	    exec(implode(' ', $cmd) . ' 2>&1', $output, $ret);
+	    if ($ret !== 0) {
+	        throw new ImageOptimizerException(sprintf('Exec error gifsicle (%d): %s', $ret, implode("\n", $output)), ImageOptimizerException::EXEC_ERROR);
+	    }
+	    if (false === ($binaryContent = file_get_contents($of))) {
+	        throw new ImageOptimizerException(sprintf('Cannot read tmpfile : %s', $of), ImageOptimizerException::CANNOT_READ_TMPFILE);
+	    }
+	    unlink($of);
+	    return 'image/gif';
+	}
+	
+}

Diff for: tests/ImageOptimizerTests.php

@@ -4,6 +4,7 @@
 use ImageStack\Image;
 use ImageStack\ImageOptimizer\JpegtranImageOptimizer;
 use ImageStack\ImageOptimizer\PngcrushImageOptimizer;
+use ImageStack\ImageOptimizer\GifsicleImageOptimizer;
 
 class ImageOptimizerTests extends \PHPUnit_Framework_TestCase
 {
@@ -42,4 +43,26 @@ public function testPngcrushOptimizer()
 
         $this->assertStringEqualsFile(__DIR__ . '/resources/optimizer/cat2_pngcrush.png', $image->getBinaryContent());
     }
+
+    public function testGifsicleOptimizer()
+    {
+        $image = new Image(file_get_contents(__DIR__ . '/resources/photos/eclipse256.gif'));
+        
+        $optimizer = new GifsicleImageOptimizer();
+        
+        $optimizer->optimizeImage($image);
+        
+        $this->assertStringEqualsFile(__DIR__ . '/resources/optimizer/eclipse256.gif', $image->getBinaryContent());
+    }
+
+    public function testGifsicleOptimizerAnim()
+    {
+        $image = new Image(file_get_contents(__DIR__ . '/resources/photos/animated.gif'));
+        
+        $optimizer = new GifsicleImageOptimizer();
+        
+        $optimizer->optimizeImage($image);
+        
+        $this->assertStringEqualsFile(__DIR__ . '/resources/optimizer/animated.gif', $image->getBinaryContent());
+    }
 }