Merge branch 'hotfix/4877'

Close zendframework/zendframework#4877
zendframework · Aug 19, 2013 · 3ddc8fa · 3ddc8fa
commit 3ddc8fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/test/File/IsCompressedTest.php b/test/File/IsCompressedTest.php
@@ -26,7 +26,7 @@ protected function getMagicMime()
     {
         // As of PHP >= 5.3.11 and >= 5.4.1 the magic database format has changed.
         // http://doc.php.net/downloads/pdf/split/de/File-Information.pdf (page 11)
-        if (version_compare(PHP_VERSION, '5.3.10', '<=')
+        if (version_compare(PHP_VERSION, '5.3.11', '<')
             || (version_compare(PHP_VERSION, '5.4', '>=')
                 && version_compare(PHP_VERSION, '5.4.1', '<'))
         ) {

diff --git a/test/File/IsImageTest.php b/test/File/IsImageTest.php
@@ -26,8 +26,10 @@ protected function getMagicMime()
     {
         // As of PHP >= 5.3.11 and >= 5.4.1 the magic database format has changed.
         // http://doc.php.net/downloads/pdf/split/de/File-Information.pdf (page 11)
-        if (version_compare(PHP_VERSION, '5.3.10', '<=') || (version_compare(PHP_VERSION, '5.4', '>=') &&
-                                                             version_compare(PHP_VERSION, '5.4.1', '<'))) {
+        if (version_compare(PHP_VERSION, '5.3.11', '<')
+            || (version_compare(PHP_VERSION, '5.4', '>=')
+                && version_compare(PHP_VERSION, '5.4.1', '<'))
+        ) {
             return __DIR__ . '/_files/magic.lte.5.3.10.mime';
         }