refs #3323 enable static png images in integration tests across additional php versions

2 files changed, 3 insertions, 3 deletions

diff --git a/tests/PHPUnit/BaseFixture.php b/tests/PHPUnit/BaseFixture.php
index de2579f01c..acce41bf2b 100644
--- a/tests/PHPUnit/BaseFixture.php
+++ b/tests/PHPUnit/BaseFixture.php
@@ -23,7 +23,7 @@
 abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert
 {
     const IMAGES_GENERATED_ONLY_FOR_OS = 'linux';
-    const IMAGES_GENERATED_FOR_PHP = '5.4.13';
+    const IMAGES_GENERATED_FOR_PHP = '5.3.10';
     const IMAGES_GENERATED_FOR_GD = '2.0';
 
     /** Adds data to Piwik. Creates sites, tracks visits, imports log files, etc. */
@@ -264,7 +264,7 @@ abstract class Test_Piwik_BaseFixture extends PHPUnit_Framework_Assert
         $gdInfo = gd_info();
         return
             (stristr(php_uname(), self::IMAGES_GENERATED_ONLY_FOR_OS)) &&
-            stristr(phpversion(), self::IMAGES_GENERATED_FOR_PHP) &&
+			version_compare(phpversion(), self::IMAGES_GENERATED_FOR_PHP, '>=') &&
             $gdInfo['GD Version'] == self::IMAGES_GENERATED_FOR_GD;
     }
 
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
index 796ec344c0..8e575562d2 100755
--- a/tests/PHPUnit/IntegrationTestCase.php
+++ b/tests/PHPUnit/IntegrationTestCase.php
@@ -264,7 +264,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
                 'Do take note that scheduled reports are not being tested with images. ' .
                     'If images contained in scheduled reports have been altered, tests will fail on the Piwik QA Server. ' .
                     'To include images in the test suite, please use a machine with the following specifications : ' .
-                    'OS = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_ONLY_FOR_OS.', PHP Version = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_PHP.' and GD Version = ' . Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_GD
+                    'OS = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_ONLY_FOR_OS.', Minimum PHP Version = '.Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_PHP.' and GD Version = ' . Test_Piwik_BaseFixture::IMAGES_GENERATED_FOR_GD
                     . "\n Ignore this message if you're running on your dev machine, but pay attention when it comes from the CI server."
 
             );