From ead13d1843d0419719f52f01982910671c64271b Mon Sep 17 00:00:00 2001 From: Stefano Torresi Date: Wed, 24 Jul 2013 12:33:34 +0200 Subject: [PATCH] fix PHP_VERSION comparison operator --- tests/ZendTest/Validator/File/IsCompressedTest.php | 2 +- tests/ZendTest/Validator/File/IsImageTest.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/ZendTest/Validator/File/IsCompressedTest.php b/tests/ZendTest/Validator/File/IsCompressedTest.php index 690fd4eea9f..e4a3bb5bbb5 100644 --- a/tests/ZendTest/Validator/File/IsCompressedTest.php +++ b/tests/ZendTest/Validator/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/tests/ZendTest/Validator/File/IsImageTest.php b/tests/ZendTest/Validator/File/IsImageTest.php index e7bcea6ec37..5cb5d666076 100644 --- a/tests/ZendTest/Validator/File/IsImageTest.php +++ b/tests/ZendTest/Validator/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'; }