Make some updates on CI and bootstrapping to use docker-based ImageMagick

Author: Pierstoval

.github/workflows/php.yml

@@ -18,13 +18,10 @@ jobs:
         steps:
             - uses: actions/checkout@v2
 
-            - name: Install ImageMagick dependencies
+            - name: Install ImageMagick
               run: |
                   sudo apt-get update
                   sudo apt-get upgrade -y libjpeg-dev libpng-dev libgif-dev make wget
-
-            - name: Install ImageMagick
-              run: |
                   wget https://www.imagemagick.org/download/ImageMagick.tar.gz
                   tar xvzf ImageMagick.tar.gz
                   cd ImageMagick-*
@@ -51,4 +48,6 @@ jobs:
 
             - run: composer install
 
-            - run: vendor/bin/phpunit
+            - run: |
+                # export IMAGEMAGICK_PATH="docker run --rm --volume `pwd`:`pwd` --workdir=`pwd` --entrypoint="`pwd`/docker_entrypoint.sh" --user=$UID:$GID dpokidov/imagemagick:latest magick"
+                vendor/bin/phpunit

Tests/bootstrap.php

@@ -27,13 +27,13 @@
 
 // Check if ImageMagick is installed. Instead, we cannot run tests suite.
 $possibleDirectories = [
+    getenv('IMAGEMAGICK_PATH') ?: null,
     null,// In the PATH variable, default behavior
     '/usr/bin/magick',
     '/usr/local/bin/magick',
-    getenv('IMAGEMAGICK_PATH') ?: null, // Fall back again to PATH
 ];
 foreach ($possibleDirectories as $path) {
-    echo 'Check "'.$path.'" binary'."\n";
+    echo 'Check for ImageMagick with path "'.$path."\"\n";
     try {
         $path = Command::findMagickBinaryPath($path);
         exec($path.' -version', $o, $code);
@@ -42,6 +42,7 @@
             break;
         }
     } catch (MagickBinaryNotFoundException $e) {
+        echo 'Did not find ImageMagick with path "'.$path.'". '.$e->getMessage()."\n";
     }
 }
 
@@ -53,5 +54,5 @@
     );
 }
 
-echo 'Analyzed ImageMagick directory: '.IMAGEMAGICK_DIR."\n";
+echo 'ImageMagick resolved to: "'.IMAGEMAGICK_DIR."\"\n";
 system(IMAGEMAGICK_DIR.' -version');

src/Command.php

@@ -80,7 +80,7 @@ public function __construct(?string $magickBinaryPath = '')
     {
         $magickBinaryPath = self::findMagickBinaryPath($magickBinaryPath);
 
-        $process = new Process([$magickBinaryPath, '-version']);
+        $process = Process::fromShellCommandline($magickBinaryPath.' -version');
 
         try {
             $code = $process->run();
@@ -115,16 +115,6 @@ public static function findMagickBinaryPath(?string $magickBinaryPath): string
             throw new MagickBinaryNotFoundException((string) $magickBinaryPath);
         }
 
-        // Add a proper directory separator at the end if path is not empty.
-        // If it's empty, then it's set in the global path.
-        if (!\is_file($magickBinaryPath)) {
-            throw new MagickBinaryNotFoundException($magickBinaryPath);
-        }
-
-        if (!\is_executable($magickBinaryPath)) {
-            throw new \InvalidArgumentException(\sprintf('The specified script (%s) is not executable.', $magickBinaryPath));
-        }
-
         return $magickBinaryPath;
     }
 

src/MagickBinaryNotFoundException.php

@@ -20,7 +20,7 @@ class MagickBinaryNotFoundException extends Exception
     public function __construct(string $magickBinaryPath)
     {
         parent::__construct(\sprintf(
-            'The specified path (%s) is not a file.'."\n".
+            'The specified path ("%s") is not a file.'."\n".
             'You must set the "magickBinaryPath" parameter as the main "magick" binary installed by ImageMagick.',
             $magickBinaryPath
         ));