refactoring

tests/PhpZip/Internal/DummyFileSystemStream.php

@@ -10,10 +10,16 @@ class DummyFileSystemStream
     /** @var resource */
     private $fp;
 
+    /**
+     * @param $path
+     * @param $mode
+     * @param $options
+     * @param $opened_path
+     *
+     * @return bool
+     */
     public function stream_open($path, $mode, $options, &$opened_path)
     {
-//        echo "DummyFileSystemStream->stream_open($path, $mode, $options)" . PHP_EOL;
-
         $parsedUrl = parse_url($path);
         $path = $parsedUrl['path'];
         $this->fp = fopen($path, $mode);
@@ -21,37 +27,46 @@ class DummyFileSystemStream
         return true;
     }
 
+    /**
+     * @param $count
+     *
+     * @return false|string
+     */
     public function stream_read($count)
     {
-//        echo "DummyFileSystemStream->stream_read($count)" . PHP_EOL;
-        $position = ftell($this->fp);
-
-//        echo "Loading chunk " . $position . " to " . ($position + $count - 1) . PHP_EOL;
         return fread($this->fp, $count);
-//        echo "String length: " . strlen($ret) . PHP_EOL;
     }
 
+    /**
+     * @return false|int
+     */
     public function stream_tell()
     {
-//        echo "DummyFileSystemStream->stream_tell()" . PHP_EOL;
         return ftell($this->fp);
     }
 
+    /**
+     * @return bool
+     */
     public function stream_eof()
     {
-//        echo "DummyFileSystemStream->stream_eof()" . PHP_EOL;
         return feof($this->fp);
     }
 
+    /**
+     * @param $offset
+     * @param $whence
+     */
     public function stream_seek($offset, $whence)
     {
-//        echo "DummyFileSystemStream->stream_seek($offset, $whence)" . PHP_EOL;
         fseek($this->fp, $offset, $whence);
     }
 
+    /**
+     * @return array
+     */
     public function stream_stat()
     {
-//        echo "DummyFileSystemStream->stream_stat()" . PHP_EOL;
         return fstat($this->fp);
     }
 }

tests/PhpZip/PhpZipExtResourceTest.php

@@ -133,10 +133,10 @@ class PhpZipExtResourceTest extends ZipTestCase
         static::assertTrue(mkdir($this->outputDirname, 0755, true));
 
         $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->setReadPassword('bar');
 
         try {
-            $zipFile->openFile($filename);
-            $zipFile->setReadPassword('bar');
             $zipFile->extractTo($this->outputDirname);
             static::markTestIncomplete('failed test');
         } catch (ZipException $exception) {