[Zend\Filter\Compress] added PHP 5.4 support for strings in Bz2 and Gz decompress

library/Zend/Filter/Compress/Bz2.php

@@ -133,7 +133,9 @@ public function compress($content)
     public function decompress($content)
     {
         $archive = $this->getArchive();
-        if (file_exists($content)) {
+
+        //check if there are null byte characters before doing a file_exists check
+        if (!strstr($content, "\0") && file_exists($content)) {
             $archive = $content;
         }
 

library/Zend/Filter/Compress/Gz.php

@@ -165,7 +165,9 @@ public function decompress($content)
     {
         $archive = $this->getArchive();
         $mode    = $this->getMode();
-        if (file_exists($content)) {
+
+        //check if there are null byte characters before doing a file_exists check
+        if (!strstr($content, "\0") && file_exists($content)) {
             $archive = $content;
         }
 

tests/ZendTest/Filter/Compress/Bz2Test.php

@@ -37,10 +37,6 @@ public function tearDown()
      */
     public function testBasicUsage()
     {
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $this->markTestIncomplete('Code to test is not compatible with PHP 5.4 ');
-        }
-
         $filter  = new Bz2Compression();
 
         $content = $filter->compress('compress me');

tests/ZendTest/Filter/Compress/GzTest.php

@@ -37,10 +37,6 @@ public function tearDown()
      */
     public function testBasicUsage()
     {
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $this->markTestIncomplete('Code to test is not compatible with PHP 5.4 ');
-        }
-
         $filter  = new GzCompression();
 
         $content = $filter->compress('compress me');
@@ -164,10 +160,6 @@ public function testGzCompressToFile()
      */
     public function testGzDeflate()
     {
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $this->markTestIncomplete('Code to test is not compatible with PHP 5.4 ');
-        }
-
         $filter  = new GzCompression(array('mode' => 'deflate'));
 
         $content = $filter->compress('compress me');

tests/ZendTest/Filter/CompressTest.php

@@ -37,10 +37,6 @@ public function tearDown()
      */
     public function testBasicUsage()
     {
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $this->markTestIncomplete('Code to test is not compatible with PHP 5.4 ');
-        }
-
         $filter  = new CompressFilter('bz2');
 
         $text     = 'compress me';

tests/ZendTest/Filter/DecompressTest.php

@@ -37,10 +37,6 @@ public function tearDown()
      */
     public function testBasicUsage()
     {
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $this->markTestIncomplete('Code to test is not compatible with PHP 5.4 ');
-        }
-
         $filter  = new DecompressFilter('bz2');
 
         $text       = 'compress me';

tests/ZendTest/Filter/Encrypt/BlockCipherTest.php

@@ -200,10 +200,6 @@ public function testSettingEmptyVector()
      */
     public function testEncryptionWithDecryptionAndCompressionMcrypt()
     {
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $this->markTestIncomplete('Code to test is not compatible with PHP 5.4 ');
-        }
-
         if (!extension_loaded('bz2')) {
             $this->markTestSkipped('This adapter needs the bz2 extension');
         }

tests/ZendTest/Filter/Encrypt/OpensslTest.php

@@ -274,10 +274,6 @@ public function testEncryptionWithDecryptionWithPackagedKeys()
      */
     public function testEncryptionWithDecryptionAndCompressionWithPackagedKeys()
     {
-        if (version_compare(phpversion(), '5.4', '>=')) {
-            $this->markTestIncomplete('Code to test is not compatible with PHP 5.4 ');
-        }
-
         if (!extension_loaded('bz2')) {
             $this->markTestSkipped('Bz2 extension for compression test needed');
         }