EZP-21949: Fixed ImageMagick related fails on Travis

Author: lolautruche

bootstrap.php

@@ -58,6 +58,7 @@ function ()
     // Exposing in env variables in order be able to use them in test cases.
     $_ENV['legacyKernel'] = $legacyKernel;
     $_ENV['legacyPath'] = $settings['service']['parameters']['legacy_dir'];
+    $_ENV['imagemagickConvertPath'] = $settings['service']['parameters']['imagemagick_convert_path'];
 }
 
 return include 'container.php';

config.php-DEVELOPMENT

@@ -61,6 +61,7 @@ return array(
                 getcwd() . '/ezpublish_legacy' :
                 __DIR__ . '/vendor/ezsystems/ezpublish-legacy'
             ),
+            'imagemagick_convert_path' => '/usr/bin/convert'
         )
     )
 );

eZ/Bundle/EzPublishCoreBundle/Tests/DependencyInjection/EzPublishCoreExtensionTest.php

@@ -96,21 +96,40 @@ public function testSiteAccessNoConfiguration()
 
     public function testImageMagickConfigurationBasic()
     {
-        $this->load();
+        if ( !isset( $_ENV['imagemagickConvertPath'] ) || !is_executable( $_ENV['imagemagickConvertPath'] ) )
+        {
+            $this->markTestSkipped( 'Missing or mis-configured Imagemagick convert path.' );
+        }
+
+        $this->load(
+            array(
+                'imagemagick' => array(
+                    'enabled' => true,
+                    'path' => $_ENV['imagemagickConvertPath']
+                )
+            )
+        );
         $this->assertContainerBuilderHasParameter( 'ezpublish.image.imagemagick.enabled', true );
-        $this->assertContainerBuilderHasParameter( 'ezpublish.image.imagemagick.executable_path', dirname( $this->minimalConfig['imagemagick']['path'] ) );
-        $this->assertContainerBuilderHasParameter( 'ezpublish.image.imagemagick.executable', basename( $this->minimalConfig['imagemagick']['path'] ) );
+        $this->assertContainerBuilderHasParameter( 'ezpublish.image.imagemagick.executable_path', dirname( $_ENV['imagemagickConvertPath'] ) );
+        $this->assertContainerBuilderHasParameter( 'ezpublish.image.imagemagick.executable', basename( $_ENV['imagemagickConvertPath'] ) );
     }
 
     public function testImageMagickConfigurationFilters()
     {
+        if ( !isset( $_ENV['imagemagickConvertPath'] ) || !is_executable( $_ENV['imagemagickConvertPath'] ) )
+        {
+            $this->markTestSkipped( 'Missing or mis-configured Imagemagick convert path.' );
+        }
+
         $customFilters = array(
             'foobar' => '-foobar',
             'wow' => '-amazing'
         );
         $this->load(
             array(
                 'imagemagick' => array(
+                    'enabled' => true,
+                    'path' => $_ENV['imagemagickConvertPath'],
                     'filters' => $customFilters
                 )
             )

eZ/Bundle/EzPublishCoreBundle/Tests/DependencyInjection/Fixtures/ezpublish_minimal.yml

@@ -22,8 +22,7 @@ siteaccess:
             the_back: ezdemo_site_admin
 
 imagemagick:
-    enabled: true
-    path: /opt/local/bin/convert
+    enabled: false
 
 http_cache:
     purge_type: local

eZ/Bundle/EzPublishCoreBundle/Tests/DependencyInjection/Fixtures/ezpublish_minimal_no_siteaccess.yml

@@ -1,6 +1,5 @@
 imagemagick:
-    enabled: true
-    path: /opt/local/bin/convert
+    enabled: false
 
 http_cache:
     purge_type: local