From 8efbfd67f4a00cae7b5ca7380160666c025237d6 Mon Sep 17 00:00:00 2001
From: wapplay <alexey@nelexa.ru>
Date: Fri, 3 Jan 2020 23:52:52 +0300
Subject: [PATCH] fix php 5.5 compat, fix append stream filter

---
 src/IO/ZipReader.php |  5 +++++
 src/ZipFile.php      | 25 +++++++------------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/IO/ZipReader.php b/src/IO/ZipReader.php
index 764657f..773474e 100644
--- a/src/IO/ZipReader.php
+++ b/src/IO/ZipReader.php
@@ -765,6 +765,11 @@ class ZipReader
             $filters[] = $encContextFilter;
         }
 
+        // hack, see https://groups.google.com/forum/#!topic/alt.comp.lang.php/37_JZeW63uc
+        $pos = ftell($this->inStream);
+        rewind($this->inStream);
+        fseek($this->inStream, $pos);
+
         $contextDecompress = null;
         switch ($compressionMethod) {
             case ZipCompressionMethod::STORED:
diff --git a/src/ZipFile.php b/src/ZipFile.php
index 5b4f656..1af7828 100644
--- a/src/ZipFile.php
+++ b/src/ZipFile.php
@@ -1,6 +1,7 @@
 <?php
 
 /** @noinspection AdditionOperationOnArraysInspection */
+
 /** @noinspection PhpUsageOfSilenceOperatorInspection */
 
 namespace PhpZip;
@@ -243,8 +244,8 @@ class ZipFile implements ZipFileInterface
      *
      * @param string $entryName
      *
-     * @throws ZipEntryNotFoundException
      * @throws ZipException
+     * @throws ZipEntryNotFoundException
      *
      * @return string
      */
@@ -259,8 +260,8 @@ class ZipFile implements ZipFileInterface
      * @param string      $entryName
      * @param string|null $comment
      *
-     * @throws ZipException
      * @throws ZipEntryNotFoundException
+     * @throws ZipException
      *
      * @return ZipFile
      */
@@ -276,8 +277,8 @@ class ZipFile implements ZipFileInterface
      *
      * @param string $entryName
      *
-     * @throws ZipException
      * @throws ZipEntryNotFoundException
+     * @throws ZipException
      *
      * @return string
      */
@@ -295,8 +296,8 @@ class ZipFile implements ZipFileInterface
     /**
      * @param string $entryName
      *
-     * @throws ZipException
      * @throws ZipEntryNotFoundException
+     * @throws ZipException
      *
      * @return resource
      */
@@ -313,8 +314,8 @@ class ZipFile implements ZipFileInterface
      *
      * @param string|ZipEntry $entryName
      *
-     * @throws ZipEntryNotFoundException
      * @throws ZipException
+     * @throws ZipEntryNotFoundException
      *
      * @return ZipInfo
      */
@@ -395,19 +396,7 @@ class ZipFile implements ZipFileInterface
 
             if (\is_array($entries)) {
                 $entries = array_unique($entries);
-                $flipEntries = array_flip($entries);
-                $zipEntries = array_filter(
-                    $zipEntries,
-                    /**
-                     * @param string $entryName
-                     *
-                     * @return bool
-                     */
-                    static function ($entryName) use ($flipEntries) {
-                        return isset($flipEntries[$entryName]);
-                    },
-                    \ARRAY_FILTER_USE_KEY
-                );
+                $zipEntries = array_intersect_key($zipEntries, array_flip($entries));
             }
         }