Merge branch 'feature/4397' into develop

Close zendframework/zendframework#4397
zendframework · Jun 28, 2013 · c552cbc · c552cbc
commit c552cbc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/test/File/IsCompressedTest.php b/test/File/IsCompressedTest.php
@@ -33,6 +33,11 @@ protected function getMagicMime()
             return __DIR__ . '/_files/magic.lte.5.3.10.mime';
         }
 
+        // Ubuntu has backported the changes in 12.04 to PHP 5.3.10.
+        if (strpos(PHP_VERSION, 'ubuntu') !== false && version_compare(PHP_VERSION, '5.3.10', '>=')) {
+            return __DIR__ . '/_files/magic.lte.5.3.10.mime';
+        }
+
         return __DIR__ . '/_files/magic.mime';
     }
 

diff --git a/test/File/IsImageTest.php b/test/File/IsImageTest.php
@@ -31,6 +31,11 @@ protected function getMagicMime()
             return __DIR__ . '/_files/magic.lte.5.3.10.mime';
         }
 
+        // Ubuntu has backported the changes in 12.04 to PHP 5.3.10.
+        if (strpos(PHP_VERSION, 'ubuntu') !== false && version_compare(PHP_VERSION, '5.3.10', '>=')) {
+            return __DIR__ . '/_files/magic.lte.5.3.10.mime';
+        }
+
         return __DIR__ . '/_files/magic.mime';
     }