Refactor common stream creation code

Author: thekid

src/main/php/io/archive/zip/AbstractZipReaderImpl.class.php

@@ -221,9 +221,10 @@ public function currentEntry() {
           $this->skip= $header['compressed'] + 16;
         }
 
+        $stream= new ZipFileInputStream($this, $this->position, $header['compressed']);
+
         // AES vs. traditional PKZIP cipher
         if (99 === $header['compression']) {
-          $stream= new ZipFileInputStream($this, $this->position, $header['compressed']);
           $aes= unpack('vheader/vsize/vversion/a2vendor/cstrength/vcompression', $extra);
           $header['compression']= $aes['compression'];
           $is= function() use($header, $stream, $aes) {
@@ -253,7 +254,6 @@ public function currentEntry() {
             );
           };
         } else if ($header['flags'] & 1) {
-          $stream= new ZipFileInputStream($this, $this->position, $header['compressed']);
           $is= function() use($header, $stream) {
             if (null === $this->password) {
               throw new IllegalAccessException('No password set');
@@ -270,7 +270,6 @@ public function currentEntry() {
             return new DecipheringInputStream($stream, $cipher);
           };
         } else {
-          $stream= new ZipFileInputStream($this, $this->position, $header['compressed']);
           $is= function() use($stream) { return $stream; };
         }