Remove dependency on convert and composite

config/configuration.sample.yml

@@ -30,8 +30,6 @@ main:
 binaries:
     ghostscript_binary: null
     php_binary: null
-    convert_binary: null
-    composite_binary: null
     swf_extract_binary: null
     pdf2swf_binary: null
     swf_render_binary: null

lib/Alchemy/Phrasea/Command/Setup/Install.php

@@ -254,8 +254,6 @@ class Install extends Command
         return array(
             'php_binary'           => $this->executableFinder->find('php'),
             'phraseanet_indexer'   => $this->executableFinder->find('phraseanet_indexer'),
-            'convert_binary'       => $this->executableFinder->find('convert'),
-            'composite_binary'     => $this->executableFinder->find('composite'),
             'pdf2swf_binary'       => $this->executableFinder->find('pdf2swf'),
             'swf_extract_binary'   => $this->executableFinder->find('swfextract'),
             'swf_render_binary'    => $this->executableFinder->find('swfrender'),

lib/Alchemy/Phrasea/Controller/Setup.php

@@ -147,8 +147,6 @@ class Setup implements ControllerProviderInterface
             foreach (array(
                 'php_binary'         => $request->request->get('binary_php'),
                 'phraseanet_indexer' => $request->request->get('binary_phraseanet_indexer'),
-                'convert_binary'     => $request->request->get('binary_convert'),
-                'composite_binary'   => $request->request->get('binary_composite'),
                 'swf_extract_binary' => $request->request->get('binary_swfextract'),
                 'pdf2swf_binary'     => $request->request->get('binary_pdf2swf'),
                 'swf_render_binary'  => $request->request->get('binary_swfrender'),

lib/Alchemy/Phrasea/Core/Version.php

@@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core;
  */
 class Version
 {
-    protected static $number = '3.8.0.a14';
+    protected static $number = '3.8.0.a15';
     protected static $name = 'Carnosaurus';
 
     public static function getNumber()

lib/Alchemy/Phrasea/Setup/Probe/BinariesProbe.php

@@ -20,14 +20,12 @@ class BinariesProbe extends BinariesRequirements implements ProbeInterface
     {
         parent::__construct(array_filter(array(
             'php_binary'         => isset($binaries['php_binary']) ? $binaries['php_binary'] : null,
-            'convert_binary'     => isset($binaries['convert_binary']) ? $binaries['convert_binary'] : null,
             'pdf2swf_binary'     => isset($binaries['pdf2swf_binary']) ? $binaries['pdf2swf_binary'] : null,
             'unoconv_binary'     => isset($binaries['unoconv_binary']) ? $binaries['unoconv_binary'] : null,
             'swf_extract_binary' => isset($binaries['swf_extract_binary']) ? $binaries['swf_extract_binary'] : null,
             'swf_render_binary'  => isset($binaries['swf_render_binary']) ? $binaries['swf_render_binary'] : null,
             'mp4box_binary'      => isset($binaries['mp4box_binary']) ? $binaries['mp4box_binary'] : null,
             'pdftotext_binary'   => isset($binaries['pdftotext_binary']) ? $binaries['pdftotext_binary'] : null,
-            'composite_binary'   => isset($binaries['composite_binary']) ? $binaries['composite_binary'] : null,
             'ffmpeg_binary'      => isset($binaries['ffmpeg_binary']) ? $binaries['ffmpeg_binary'] : null,
             'ffprobe_binary'     => isset($binaries['ffprobe_binary']) ? $binaries['ffprobe_binary'] : null,
         )));

lib/Alchemy/Phrasea/Setup/Requirements/BinariesRequirements.php

@@ -58,48 +58,6 @@ class BinariesRequirements extends RequirementCollection implements RequirementI
             );
         }
 
-        $convert = isset($binaries['convert_binary']) ? $binaries['convert_binary'] : $finder->find('convert');
-
-        $this->addRequirement(
-            null !== $convert && is_executable($convert),
-            'ImageMagick Convert is required',
-            'Please install ImageMagick'
-        );
-
-        if (null !== $convert) {
-            $output = null;
-            exec($convert . ' --version', $output);
-            $data = sscanf($output[0], 'Version: ImageMagick %d.%d.%d');
-            $version = sprintf('%d.%d.%d', $data[0], $data[1], $data[2]);
-
-            $this->addRequirement(
-                version_compare(static::IMAGICK_VERSION, $version, '<'),
-                sprintf('Convert version %s or higher is required (%s provided)', static::IMAGICK_VERSION, $version),
-                'Please update to a more recent version'
-            );
-        }
-
-        $composite = isset($binaries['composite_binary']) ? $binaries['composite_binary'] : $finder->find('composite');
-
-        $this->addRequirement(
-            null !== $composite && is_executable($composite),
-            'ImageMagick Composite is required',
-            'Please install ImageMagick'
-        );
-
-        if (null !== $composite) {
-            $output = null;
-            exec($composite . ' --version', $output);
-            $data = sscanf($output[0], 'Version: ImageMagick %d.%d.%d');
-            $version = sprintf('%d.%d.%d', $data[0], $data[1], $data[2]);
-
-            $this->addRequirement(
-                version_compare(static::IMAGICK_VERSION, $version, '<'),
-                sprintf('Composite version %s or higher is required (%s provided)', static::IMAGICK_VERSION, $version),
-                'Please update to a more recent version.'
-            );
-        }
-
         $exiftool = __DIR__ . '/../../../../../vendor/phpexiftool/exiftool/exiftool' . (defined('PHP_WINDOWS_VERSION_BUILD') ? '.exe' : '');
 
         $this->addRequirement(

lib/classes/API/V1/adapter.php

@@ -425,7 +425,6 @@ class API_V1_adapter extends API_V1_Abstract
                 'binary'  => array(
                     'phpCli'            => isset($binaries['php_binary']) ? $binaries['php_binary'] : null,
                     'phpIni'            => $app['phraseanet.registry']->get('GV_PHP_INI'),
-                    'imagick'           => $app['phraseanet.registry']->get('convert_binary'),
                     'swfExtract'        => isset($binaries['swf_extract_binary']) ? $binaries['swf_extract_binary'] : null,
                     'pdf2swf'           => isset($binaries['pdf2swf_binary']) ? $binaries['pdf2swf_binary'] : null,
                     'swfRender'         => isset($binaries['swf_render_binary']) ? $binaries['swf_render_binary'] : null,

lib/classes/patch/373.php

@@ -78,8 +78,6 @@ class patch_373 implements patchInterface
 
         $mapping = array(
             'GV_cli'           => 'php_binary',
-            'GV_imagick'       => 'convert_binary',
-            'GV_pathcomposite' => 'composite_binary',
             'GV_swf_extract'   => 'swf_extract_binary',
             'GV_pdf2swf'       => 'pdf2swf_binary',
             'GV_swf_render'    => 'swf_render_binary',

lib/conf.d/configuration.yml

@@ -33,8 +33,6 @@ debugger:
 binaries:
     ghostscript_binary: null
     php_binary: null
-    convert_binary: null
-    composite_binary: null
     swf_extract_binary: null
     pdf2swf_binary: null
     swf_render_binary: null