Merge branch 'hotfix/3.1.15'

Fixed slightly confusing language regarding setPassword

.gitattributes

@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpunit.xml export-ignore
+tests export-ignore

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -0,0 +1,23 @@
+---
+name: 🔴 Bug Report
+about: Report errors and problems
+
+---
+
+| Q                            | A
+| -----------------------------| ---
+| Library version(s) affected: | x.y.z
+| PHP version(s):              | x.y.z
+| OS (with bit depth):         | <!-- ex. Ubuntu 18.04 64-bit -->
+
+**Description**  
+<!-- A clear and concise description of the problem. -->
+
+**How to reproduce**  
+<!-- Code to reproduce the problem. -->
+
+**Possible Solution**  
+<!--- Optional: only if you have suggestions on a fix/reason for the bug -->
+
+**Additional context**  
+<!-- Optional: any other context about the problem: error messages, stack trace, zip files, etc. -->

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -0,0 +1,12 @@
+---
+name: 🚀 Feature Request
+about: Ideas for new features and improvements
+
+---
+
+**Description**  
+<!-- A clear and concise description of the new feature. -->
+
+**Example**  
+<!-- A simple example of the new feature in action (include PHP code)
+     If the new feature changes an existing feature, include a simple before/after comparison. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+| Q             | A
+| ------------- | ---
+| Bug fix?      | yes/no
+| New feature?  | yes/no <!-- don't forget to update CHANGELOG.md file -->
+
+<!--
+Write a short README entry for your feature/bugfix here (replace this comment block.)
+
+Do NOT send pull request to `master` branch.
+Please send to `develop` branch instead.
+Any PR to `master` branch will NOT be merged.
+-->

.gitignore

@@ -1,4 +1,5 @@
 /vendor
 *.iml
 /.idea
-/composer.lock
+/composer.lock
+/.php_cs.cache

.travis.yml

@@ -0,0 +1,22 @@
+dist: trusty
+
+language: php
+php:
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - '7.1'
+  - '7.2'
+  - '7.3'
+  - '7.4'
+
+install:
+  - travis_retry composer self-update && composer --version
+  - travis_retry composer install --no-interaction
+
+before_script:
+  - sudo apt-get install p7zip-full
+
+script:
+  - composer validate --no-check-lock
+  - vendor/bin/phpunit -v -c phpunit.xml

CHANGELOG.md

@@ -0,0 +1,42 @@
+# Changelog
+
+# 3.1.2 (2017-11-17)
+- Changed the algorithm for adding paddings to zipalign. 
+  Now we will use the special field ExtraField c ID 0xD935, 
+  which was implemented by Google in the apksigner library. 
+  Now this field corresponds to the ZIP standard for storing 
+  ExtraField records, and not just filling with zero bytes, 
+  as in the zipalign console utility.
+
+## 3.1.1 (2017-11-15)
+- Fix resave zip aligned archive
+
+## 3.1.0 (2017-11-14)
+- Added class `ZipModel` for all changes.
+- All manipulations with incoming and outgoing streams are in separate files: `ZipInputStream` and `ZipOutputStream`.
+- Removed class `CentralDirectory`.
+- Optimized extra fields classes.
+- Fixed issue #4 (`count()` returns 0 when files are added in directories).
+- Implemented issue #8 - support inline Content-Disposition and empty output filename.
+- Optimized and tested on a php 32-bit platform (issue #5).
+- Added output as PSR-7 Response.
+- Added methods for canceling changes.
+- Added [russian documentation](README.RU.md).
+- Updated [documentation](README.md).
+- Declared deprecated methods:
+  + rename `ZipFile::withReadPassword` to `ZipFile::setReadPassword`
+  + rename `ZipFile::withNewPassword` to `ZipFile::setPassword`
+  + rename `ZipFile::withoutPassword` to `ZipFile::disableEncryption`
+
+## 3.0.3 (2017-11-11)
+Fix bug issue #8 - Error if the file is empty.
+
+## 3.0.0 (2017-03-15)
+Merge `ZipOutputFile` with ZipFile and optimize the zip archive update.
+
+See the update instructions in README.md.
+
+## 2.2.0 (2017-03-02)
+Features:
+  - create output object `ZipOutputFile` from `ZipFile` in method `ZipFile::edit()`.
+  - create output object `ZipOutputFile` from filename in static method `ZipOutputFile::openFromFile(string $filename)`.

README.RU.md

@@ -0,0 +1,829 @@
+`PhpZip`
+========
+`PhpZip` - php библиотека для продвинутой работы с ZIP-архивами.
+
+[![Build Status](https://travis-ci.org/Ne-Lexa/php-zip.svg?branch=master)](https://travis-ci.org/Ne-Lexa/php-zip)
+[![Latest Stable Version](https://poser.pugx.org/nelexa/zip/v/stable)](https://packagist.org/packages/nelexa/zip)
+[![Total Downloads](https://poser.pugx.org/nelexa/zip/downloads)](https://packagist.org/packages/nelexa/zip)
+[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%205.5-8892BF.svg)](https://php.net/)
+[![License](https://poser.pugx.org/nelexa/zip/license)](https://packagist.org/packages/nelexa/zip)
+
+[English Documentation](README.md)
+
+Содержание
+----------
+- [Функционал](#Features)
+- [Требования](#Requirements)
+- [Установка](#Installation)
+- [Примеры](#Examples)
+- [Глоссарий](#Glossary)
+- [Документация](#Documentation)
+  + [Обзор методов класса `\PhpZip\ZipFile`](#Documentation-Overview)
+  + [Создание/Открытие ZIP-архива](#Documentation-Open-Zip-Archive)
+  + [Чтение записей из архива](#Documentation-Open-Zip-Entries)
+  + [Перебор записей/Итератор](#Documentation-Zip-Iterate)
+  + [Получение информации о записях](#Documentation-Zip-Info)
+  + [Добавление записей в архив](#Documentation-Add-Zip-Entries)
+  + [Удаление записей из архива](#Documentation-Remove-Zip-Entries)
+  + [Работа с записями и с архивом](#Documentation-Entries)
+  + [Работа с паролями](#Documentation-Password)
+  + [zipalign - выравнивание архива для оптимизации Android пакетов (APK)](#Documentation-ZipAlign-Usage)
+  + [Отмена изменений](#Documentation-Unchanged)
+  + [Сохранение файла или вывод в браузер](#Documentation-Save-Or-Output-Entries)
+  + [Закрытие архива](#Documentation-Close-Zip-Archive)
+- [Запуск тестов](#Running-Tests)
+- [История изменений](#Changelog)
+- [Обновление версий](#Upgrade)
+  + [Обновление с версии 2 до версии 3.0](#Upgrade-v2-to-v3)
+
+### <a name="Features"></a> Функционал
+- Открытие и разархивирование ZIP-архивов.
+- Создание ZIP-архивов.
+- Модификация ZIP-архивов.
+- Чистый php (не требуется расширение `php-zip` и класс `\ZipArchive`).
+- Поддерживается сохранение архива в файл, вывод архива в браузер или вывод в виде строки, без сохранения в файл.
+- Поддерживаются комментарии архива и комментарии отдельных записей.
+- Получение подробной информации о каждой записи в архиве.
+- Поддерживаются только следующие методы сжатия:
+  + Без сжатия (Stored).
+  + Deflate сжатие.
+  + BZIP2 сжатие при наличии расширения `php-bz2`.
+- Поддержка `ZIP64` (размер файла более 4 GB или количество записей в архиве более 65535).
+- Встроенная поддержка выравнивания архива для оптимизации Android пакетов (APK) [`zipalign`](https://developer.android.com/studio/command-line/zipalign.html).
+- Работа с паролями для PHP 5.5
+  > **Внимание!**
+  >
+  > Для 32-bit систем, в данный момент не поддерживается метод шифрование `Traditional PKWARE Encryption (ZipCrypto)`. 
+  > Используйте метод шифрования `WinZIP AES Encryption`, когда это возможно.
+  + Установка пароля для чтения архива глобально или для некоторых записей.
+  + Изменение пароля архива, в том числе и для отдельных записей.
+  + Удаление пароля архива глобально или для отдельных записей.
+  + Установка пароля и/или метода шифрования, как для всех, так и для отдельных записей в архиве.
+  + Установка разных паролей и методов шифрования для разных записей.
+  + Удаление пароля для всех или для некоторых записей.
+  + Поддержка методов шифрования `Traditional PKWARE Encryption (ZipCrypto)` и `WinZIP AES Encryption (128, 192 или 256 bit)`.
+  + Установка метода шифрования для всех или для отдельных записей в архиве.
+
+### <a name="Requirements"></a> Требования
+- `PHP` >= 5.5 (предпочтительно 64-bit).
+- Опционально php-расширение `bzip2` для поддержки BZIP2 компрессии.
+- Опционально php-расширение `openssl` или `mcrypt` для `WinZip Aes Encryption` шифрования.
+
+### <a name="Installation"></a> Установка
+`composer require nelexa/zip`
+
+Последняя стабильная версия: [![Latest Stable Version](https://poser.pugx.org/nelexa/zip/v/stable)](https://packagist.org/packages/nelexa/zip)
+
+### <a name="Examples"></a> Примеры
+```php
+// создание нового архива
+$zipFile = new \PhpZip\ZipFile();
+try{
+    $zipFile
+        ->addFromString("zip/entry/filename", "Is file content") // добавить запись из строки
+        ->addFile("/path/to/file", "data/tofile") // добавить запись из файла
+        ->addDir(__DIR__, "to/path/") // добавить файлы из директории
+        ->saveAsFile($outputFilename) // сохранить архив в файл
+        ->close(); // закрыть архив
+            
+    // открытие архива, извлечение файлов, удаление файлов, добавление файлов, установка пароля и вывод архива в браузер.
+    $zipFile
+        ->openFile($outputFilename) // открыть архив из файла
+        ->extractTo($outputDirExtract) // извлечь файлы в заданную директорию
+        ->deleteFromRegex('~^\.~') // удалить все скрытые (Unix) файлы
+        ->addFromString('dir/file.txt', 'Test file') // добавить новую запись из строки
+        ->setPassword('password') // установить пароль на все записи
+        ->outputAsAttachment('library.jar'); // вывести в браузер без сохранения в файл
+}
+catch(\PhpZip\Exception\ZipException $e){
+    // обработка исключения
+}
+finally{
+    $zipFile->close();
+}
+```
+Другие примеры можно посмотреть в папке `tests/`.
+
+### <a name="Glossary"></a> Глоссарий
+**Запись в ZIP-архиве (Zip Entry)** - файл или папка в ZIP-архиве. У каждой записи в архиве есть определённые свойства, например: имя файла, метод сжатия, метод шифрования, размер файла до сжатия, размер файла после сжатия, CRC32 и другие.
+
+### <a name="Documentation"></a> Документация
+#### <a name="Documentation-Overview"></a> Обзор методов класса `\PhpZip\ZipFile`
+- [ZipFile::__construct](#Documentation-ZipFile-__construct) - инициализацирует ZIP-архив.
+- [ZipFile::addAll](#Documentation-ZipFile-addAll) - добавляет все записи из массива.
+- [ZipFile::addDir](#Documentation-ZipFile-addDir) - добавляет файлы из директории по указанному пути без вложенных директорий.
+- [ZipFile::addDirRecursive](#Documentation-ZipFile-addDirRecursive) - добавляет файлы из директории по указанному пути c вложенными директориями.
+- [ZipFile::addEmptyDir](#Documentation-ZipFile-addEmptyDir) - добавляет в ZIP-архив новую директорию.
+- [ZipFile::addFile](#Documentation-ZipFile-addFile) - добавляет в ZIP-архив файл по указанному пути.
+- [ZipFile::addFilesFromIterator](#Documentation-ZipFile-addFilesFromIterator) - добавляет файлы из итератора директорий.
+- [ZipFile::addFilesFromGlob](#Documentation-ZipFile-addFilesFromGlob) - добавляет файлы из директории в соответствии с glob шаблоном без вложенных директорий.
+- [ZipFile::addFilesFromGlobRecursive](#Documentation-ZipFile-addFilesFromGlobRecursive) - добавляет файлы из директории в соответствии с glob шаблоном c вложенными директориями.
+- [ZipFile::addFilesFromRegex](#Documentation-ZipFile-addFilesFromRegex) - добавляет файлы из директории в соответствии с регулярным выражением без вложенных директорий.
+- [ZipFile::addFilesFromRegexRecursive](#Documentation-ZipFile-addFilesFromRegexRecursive) - добавляет файлы из директории в соответствии с регулярным выражением c вложенными директориями.
+- [ZipFile::addFromStream](#Documentation-ZipFile-addFromStream) - добавляет в ZIP-архив запись из потока.
+- [ZipFile::addFromString](#Documentation-ZipFile-addFromString) - добавляет файл в ZIP-архив, используя его содержимое в виде строки.
+- [ZipFile::close](#Documentation-ZipFile-close) - закрывает ZIP-архив.
+- [ZipFile::count](#Documentation-ZipFile-count) - возвращает количество записей в архиве.
+- [ZipFile::deleteFromName](#Documentation-ZipFile-deleteFromName) - удаляет запись по имени.
+- [ZipFile::deleteFromGlob](#Documentation-ZipFile-deleteFromGlob) - удаляет записи в соответствии с glob шаблоном.
+- [ZipFile::deleteFromRegex](#Documentation-ZipFile-deleteFromRegex) - удаляет записи в соответствии с регулярным выражением.
+- [ZipFile::deleteAll](#Documentation-ZipFile-deleteAll) - удаляет все записи в ZIP-архиве.
+- [ZipFile::disableEncryption](#Documentation-ZipFile-disableEncryption) - отключает шифрования всех записей, находящихся в архиве.
+- [ZipFile::disableEncryptionEntry](#Documentation-ZipFile-disableEncryptionEntry) - отключает шифрование записи по её имени.
+- [ZipFile::extractTo](#Documentation-ZipFile-extractTo) - извлекает содержимое архива в заданную директорию.
+- [ZipFile::getAllInfo](#Documentation-ZipFile-getAllInfo) - возвращает подробную информацию обо всех записях в архиве.
+- [ZipFile::getArchiveComment](#Documentation-ZipFile-getArchiveComment) - возвращает комментарий ZIP-архива.
+- [ZipFile::getEntryComment](#Documentation-ZipFile-getEntryComment) - возвращает комментарий к записи, используя её имя.
+- [ZipFile::getEntryContent](#Documentation-ZipFile-getEntryContent) - возвращает содержимое записи.
+- [ZipFile::getEntryInfo](#Documentation-ZipFile-getEntryInfo) - возвращает подробную информацию о записи в архиве.
+- [ZipFile::getListFiles](#Documentation-ZipFile-getListFiles) - возвращает список файлов архива.
+- [ZipFile::hasEntry](#Documentation-ZipFile-hasEntry) - проверяет, присутствует ли запись в архиве.
+- [ZipFile::isDirectory](#Documentation-ZipFile-isDirectory) - проверяет, является ли запись в архиве директорией.
+- [ZipFile::matcher](#Documentation-ZipFile-matcher) - выборка записей в архиве для проведения операций над выбранными записями.
+- [ZipFile::openFile](#Documentation-ZipFile-openFile) - открывает ZIP-архив из файла.
+- [ZipFile::openFromString](#Documentation-ZipFile-openFromString) - открывает ZIP-архив из строки.
+- [ZipFile::openFromStream](#Documentation-ZipFile-openFromStream) - открывает ZIP-архив из потока.
+- [ZipFile::outputAsAttachment](#Documentation-ZipFile-outputAsAttachment) - выводит ZIP-архив в браузер.
+- [ZipFile::outputAsResponse](#Documentation-ZipFile-outputAsResponse) - выводит ZIP-архив, как Response PSR-7.
+- [ZipFile::outputAsString](#Documentation-ZipFile-outputAsString) - выводит ZIP-архив в виде строки.
+- [ZipFile::rename](#Documentation-ZipFile-rename) - переименовывает запись по имени.
+- [ZipFile::rewrite](#Documentation-ZipFile-rewrite) - сохраняет изменения и заново открывает изменившийся архив.
+- [ZipFile::saveAsFile](#Documentation-ZipFile-saveAsFile) - сохраняет архив в файл.
+- [ZipFile::saveAsStream](#Documentation-ZipFile-saveAsStream) - записывает архив в поток.
+- [ZipFile::setArchiveComment](#Documentation-ZipFile-setArchiveComment) - устанавливает комментарий к ZIP-архиву.
+- [ZipFile::setCompressionLevel](#Documentation-ZipFile-setCompressionLevel) - устанавливает уровень сжатия для всех файлов, находящихся в архиве.
+- [ZipFile::setCompressionLevelEntry](#Documentation-ZipFile-setCompressionLevelEntry) - устанавливает уровень сжатия для определённой записи в архиве.
+- [ZipFile::setCompressionMethodEntry](#Documentation-ZipFile-setCompressionMethodEntry) - устанавливает метод сжатия для определённой записи в архиве.
+- [ZipFile::setEntryComment](#Documentation-ZipFile-setEntryComment) - устанавливает комментарий к записи, используя её имя.
+- [ZipFile::setReadPassword](#Documentation-ZipFile-setReadPassword) - устанавливает пароль на чтение открытого запароленного архива для всех зашифрованных записей.
+- [ZipFile::setReadPasswordEntry](#Documentation-ZipFile-setReadPasswordEntry) - устанавливает пароль на чтение конкретной зашифрованной записи открытого запароленного архива.
+- ~~ZipFile::withNewPassword~~ - устаревший метод (**deprecated**) используйте метод [ZipFile::setPassword](#Documentation-ZipFile-setPassword).
+- [ZipFile::setPassword](#Documentation-ZipFile-setPassword) - устанавливает новый пароль для всех файлов, находящихся в архиве.
+- [ZipFile::setPasswordEntry](#Documentation-ZipFile-setPasswordEntry) - устанавливает новый пароль для конкретного файла.
+- [ZipFile::setZipAlign](#Documentation-ZipFile-setZipAlign) - устанавливает выравнивание архива для оптимизации APK файлов (Android packages).
+- [ZipFile::unchangeAll](#Documentation-ZipFile-unchangeAll) - отменяет все изменения, сделанные в архиве.
+- [ZipFile::unchangeArchiveComment](#Documentation-ZipFile-unchangeArchiveComment) - отменяет изменения в комментарии к архиву.
+- [ZipFile::unchangeEntry](#Documentation-ZipFile-unchangeEntry) - отменяет изменения для конкретной записи архива.
+- ~~ZipFile::withoutPassword~~ - устаревший метод (**deprecated**) используйте метод [ZipFile::disableEncryption](#Documentation-ZipFile-disableEncryption).
+- ~~ZipFile::withReadPassword~~ - устаревший метод (**deprecated**) используйте метод [ZipFile::setReadPassword](#Documentation-ZipFile-setReadPassword).
+
+#### <a name="Documentation-Open-Zip-Archive"></a> Создание/Открытие ZIP-архива
+<a name="Documentation-ZipFile-__construct"></a>**ZipFile::__construct** - Инициализацирует ZIP-архив.
+```php
+$zipFile = new \PhpZip\ZipFile();
+```
+<a name="Documentation-ZipFile-openFile"></a> **ZipFile::openFile** - открывает ZIP-архив из файла.
+```php
+$zipFile = new \PhpZip\ZipFile();
+$zipFile->openFile('file.zip');
+```
+<a name="Documentation-ZipFile-openFromString"></a> **ZipFile::openFromString** - открывает ZIP-архив из строки.
+```php
+$zipFile = new \PhpZip\ZipFile();
+$zipFile->openFromString($stringContents);
+```
+<a name="Documentation-ZipFile-openFromStream"></a> **ZipFile::openFromStream** - открывает ZIP-архив из потока.
+```php
+$stream = fopen('file.zip', 'rb');
+
+$zipFile = new \PhpZip\ZipFile();
+$zipFile->openFromStream($stream);
+```
+#### <a name="Documentation-Open-Zip-Entries"></a> Чтение записей из архива
+<a name="Documentation-ZipFile-count"></a> **ZipFile::count** - возвращает количество записей в архиве.
+```php
+$count = count($zipFile);
+// или
+$count = $zipFile->count();
+```
+<a name="Documentation-ZipFile-getListFiles"></a> **ZipFile::getListFiles** - возвращает список файлов архива.
+```php
+$listFiles = $zipFile->getListFiles();
+
+// Пример содержимого массива:
+// array (
+//   0 => 'info.txt',
+//   1 => 'path/to/file.jpg',
+//   2 => 'another path/',
+// )
+```
+<a name="Documentation-ZipFile-getEntryContent"></a> **ZipFile::getEntryContent** - возвращает содержимое записи.
+```php
+// $entryName = 'path/to/example-entry-name.txt';
+
+$contents = $zipFile[$entryName];
+// или
+$contents = $zipFile->getEntryContents($entryName);
+```
+<a name="Documentation-ZipFile-hasEntry"></a> **ZipFile::hasEntry** - проверяет, присутствует ли запись в архиве.
+```php
+// $entryName = 'path/to/example-entry-name.txt';
+
+$hasEntry = isset($zipFile[$entryName]);
+// или
+$hasEntry = $zipFile->hasEntry($entryName);
+```
+<a name="Documentation-ZipFile-isDirectory"></a> **ZipFile::isDirectory** - проверяет, является ли запись в архиве директорией.
+```php
+// $entryName = 'path/to/';
+
+$isDirectory = $zipFile->isDirectory($entryName);
+```
+<a name="Documentation-ZipFile-extractTo"></a> **ZipFile::extractTo** - извлекает содержимое архива в заданную директорию.
+Директория должна существовать.
+```php
+$zipFile->extractTo($directory);
+```
+Можно извлечь только некоторые записи в заданную директорию.
+Директория должна существовать.
+```php
+$extractOnlyFiles = [
+    "filename1", 
+    "filename2", 
+    "dir/dir/dir/"
+];
+$zipFile->extractTo($directory, $extractOnlyFiles);
+```
+#### <a name="Documentation-Zip-Iterate"></a> Перебор записей/Итератор
+`ZipFile` является итератором.
+Можно перебрать все записи, через цикл `foreach`.
+```php
+foreach($zipFile as $entryName => $contents){
+    echo "Файл: $entryName" . PHP_EOL;
+    echo "Содержимое: $contents" . PHP_EOL;
+    echo "-----------------------------" . PHP_EOL;
+}
+```
+Можно использовать паттерн `Iterator`.
+```php
+$iterator = new \ArrayIterator($zipFile);
+while ($iterator->valid())
+{
+    $entryName = $iterator->key();
+    $contents = $iterator->current();
+
+    echo "Файл: $entryName" . PHP_EOL;
+    echo "Содержимое: $contents" . PHP_EOL;
+    echo "-----------------------------" . PHP_EOL;
+
+    $iterator->next();
+}
+```
+#### <a name="Documentation-Zip-Info"></a> Получение информации о записях
+<a name="Documentation-ZipFile-getArchiveComment"></a> **ZipFile::getArchiveComment** - возвращает комментарий ZIP-архива.
+```php
+$commentArchive = $zipFile->getArchiveComment();
+```
+<a name="Documentation-ZipFile-getEntryComment"></a> **ZipFile::getEntryComment** - возвращает комментарий к записи, используя её имя.
+```php
+$commentEntry = $zipFile->getEntryComment($entryName);
+```
+<a name="Documentation-ZipFile-getEntryInfo"></a> **ZipFile::getEntryInfo** - возвращает подробную информацию о записи в архиве.
+```php
+$zipInfo = $zipFile->getEntryInfo('file.txt');
+
+$arrayInfo = $zipInfo->toArray();
+// Пример содержимого массива:
+// array (
+//   'name' => 'file.gif',
+//   'folder' => false,
+//   'size' => '43',
+//   'compressed_size' => '43',
+//   'modified' => 1510489440,
+//   'created' => null,
+//   'accessed' => null,
+//   'attributes' => '-rw-r--r--',
+//   'encrypted' => false,
+//   'encryption_method' => 0,
+//   'comment' => '',
+//   'crc' => 782934147,
+//   'method_name' => 'No compression',
+//   'compression_method' => 0,
+//   'platform' => 'UNIX',
+//   'version' => 10,
+// )
+
+print_r($zipInfo);
+// Вывод:
+//PhpZip\Model\ZipInfo Object
+//(
+//    [name:PhpZip\Model\ZipInfo:private] => file.gif
+//    [folder:PhpZip\Model\ZipInfo:private] => 
+//    [size:PhpZip\Model\ZipInfo:private] => 43
+//    [compressedSize:PhpZip\Model\ZipInfo:private] => 43
+//    [mtime:PhpZip\Model\ZipInfo:private] => 1510489324
+//    [ctime:PhpZip\Model\ZipInfo:private] => 
+//    [atime:PhpZip\Model\ZipInfo:private] => 
+//    [encrypted:PhpZip\Model\ZipInfo:private] => 
+//    [comment:PhpZip\Model\ZipInfo:private] => 
+//    [crc:PhpZip\Model\ZipInfo:private] => 782934147
+//    [methodName:PhpZip\Model\ZipInfo:private] => No compression
+//    [compressionMethod:PhpZip\Model\ZipInfo:private] => 0
+//    [platform:PhpZip\Model\ZipInfo:private] => UNIX
+//    [version:PhpZip\Model\ZipInfo:private] => 10
+//    [attributes:PhpZip\Model\ZipInfo:private] => -rw-r--r--
+//    [encryptionMethod:PhpZip\Model\ZipInfo:private] => 0
+//    [compressionLevel:PhpZip\Model\ZipInfo:private] => -1
+//)
+
+echo $zipInfo;
+// Вывод:
+// PhpZip\Model\ZipInfo {Name="file.gif", Size="43 bytes", Compressed size="43 bytes", Modified time="2017-11-12T15:22:04+03:00", Crc=0x2eaaa083, Method name="No compression", Attributes="-rw-r--r--", Platform="UNIX", Version=10}
+```
+<a name="Documentation-ZipFile-getAllInfo"></a> **ZipFile::getAllInfo** - возвращает подробную информацию обо всех записях в архиве.
+```php
+$zipAllInfo = $zipFile->getAllInfo();
+
+print_r($zipAllInfo);
+//Array
+//(
+//    [file.txt] => PhpZip\Model\ZipInfo Object
+//    (
+//            ...
+//    )
+//
+//    [file2.txt] => PhpZip\Model\ZipInfo Object
+//    (
+//            ...
+//    )
+//    
+//    ...
+//)
+```
+#### <a name="Documentation-Add-Zip-Entries"></a> Добавление записей в архив
+
+Все методы добавления записей в ZIP-архив позволяют указать метод сжатия содержимого.
+
+Доступны следующие методы сжатия:
+- `\PhpZip\ZipFile::METHOD_STORED` - без сжатия
+- `\PhpZip\ZipFile::METHOD_DEFLATED` - Deflate сжатие
+- `\PhpZip\ZipFile::METHOD_BZIP2` - Bzip2 сжатие при наличии расширения `ext-bz2`
+
+<a name="Documentation-ZipFile-addFile"></a> **ZipFile::addFile** - добавляет в ZIP-архив файл по указанному пути из файловой системы.
+```php
+// $file = '...../file.ext'; 
+$zipFile->addFile($file);
+
+// можно указать имя записи в архиве (если null, то используется последний компонент из имени файла)
+$zipFile->addFile($file, $entryName);
+// или
+$zipFile[$entryName] = new \SplFileInfo($file);
+
+// можно указать метод сжатия
+$zipFile->addFile($file, $entryName, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFile($file, $entryName, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFile($file, $entryName, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addFromString"></a> **ZipFile::addFromString** - добавляет файл в ZIP-архив, используя его содержимое в виде строки.
+```php
+$zipFile[$entryName] = $contents;
+// или
+$zipFile->addFromString($entryName, $contents);
+
+// можно указать метод сжатия
+$zipFile->addFromString($entryName, $contents, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFromString($entryName, $contents, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFromString($entryName, $contents, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addFromStream"></a> **ZipFile::addFromStream** - добавляет в ZIP-архив запись из потока.
+```php
+// $stream = fopen(..., 'rb');
+
+$zipFile->addFromStream($stream, $entryName);
+
+// можно указать метод сжатия
+$zipFile->addFromStream($stream, $entryName, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFromStream($stream, $entryName, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFromStream($stream, $entryName, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addEmptyDir"></a> **ZipFile::addEmptyDir** - добавляет в ZIP-архив новую (пустую) директорию.
+```php
+// $path = "path/to/";
+
+$zipFile->addEmptyDir($path);
+// или
+$zipFile[$path] = null;
+```
+<a name="Documentation-ZipFile-addAll"></a> **ZipFile::addAll** - добавляет все записи из массива.
+```php
+$entries = [
+    'file.txt' => 'file contents', // запись из строки данных
+    'empty dir/' => null, // пустой каталог
+    'path/to/file.jpg' => fopen('..../filename', 'r'), // запись из потока
+    'path/to/file.dat' => new \SplFileInfo('..../filename'), // запись из файла
+];
+
+$zipFile->addAll($entries);
+```
+<a name="Documentation-ZipFile-addDir"></a> **ZipFile::addDir** - добавляет файлы из директории по указанному пути без вложенных директорий.
+```php
+$zipFile->addDir($dirName);
+
+// можно указать путь в архиве в который необходимо поместить записи
+$localPath = "to/path/";
+$zipFile->addDir($dirName, $localPath);
+
+// можно указать метод сжатия
+$zipFile->addDir($dirName, $localPath, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addDir($dirName, $localPath, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addDir($dirName, $localPath, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addDirRecursive"></a> **ZipFile::addDirRecursive** - добавляет файлы из директории по указанному пути c вложенными директориями.
+```php
+$zipFile->addDirRecursive($dirName);
+
+// можно указать путь в архиве в который необходимо поместить записи
+$localPath = "to/path/";
+$zipFile->addDirRecursive($dirName, $localPath);
+
+// можно указать метод сжатия
+$zipFile->addDirRecursive($dirName, $localPath, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addDirRecursive($dirName, $localPath, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addDirRecursive($dirName, $localPath, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addFilesFromIterator"></a> **ZipFile::addFilesFromIterator** - добавляет файлы из итератора директорий.
+```php
+// $directoryIterator = new \DirectoryIterator($dir); // без вложенных директорий
+// $directoryIterator = new \RecursiveDirectoryIterator($dir); // с вложенными директориями
+
+$zipFile->addFilesFromIterator($directoryIterator);
+
+// можно указать путь в архиве в который необходимо поместить записи
+$localPath = "to/path/";
+$zipFile->addFilesFromIterator($directoryIterator, $localPath);
+// или
+$zipFile[$localPath] = $directoryIterator;
+
+// можно указать метод сжатия
+$zipFile->addFilesFromIterator($directoryIterator, $localPath, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFilesFromIterator($directoryIterator, $localPath, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFilesFromIterator($directoryIterator, $localPath, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+Пример добавления файлов из директории в архив с игнорированием некоторых файлов при помощи итератора директорий.
+```php
+$ignoreFiles = [
+    "file_ignore.txt", 
+    "dir_ignore/sub dir ignore/"
+];
+
+// $directoryIterator = new \DirectoryIterator($dir); // без вложенных директорий
+// $directoryIterator = new \RecursiveDirectoryIterator($dir); // с вложенными директориями
+ 
+// используйте \PhpZip\Util\Iterator\IgnoreFilesFilterIterator для не рекурсивного поиска
+$ignoreIterator = new \PhpZip\Util\Iterator\IgnoreFilesRecursiveFilterIterator(
+    $directoryIterator, 
+    $ignoreFiles
+);
+
+$zipFile->addFilesFromIterator($ignoreIterator);
+```
+<a name="Documentation-ZipFile-addFilesFromGlob"></a> **ZipFile::addFilesFromGlob** - добавляет файлы из директории в соответствии с [glob шаблоном](https://en.wikipedia.org/wiki/Glob_(programming)) без вложенных директорий.
+```php
+$globPattern = '**.{jpg,jpeg,png,gif}'; // пример glob шаблона -> добавить все .jpg, .jpeg, .png и .gif файлы
+
+$zipFile->addFilesFromGlob($dir, $globPattern);
+
+// можно указать путь в архиве в который необходимо поместить записи
+$localPath = "to/path/";
+$zipFile->addFilesFromGlob($dir, $globPattern, $localPath);
+
+// можно указать метод сжатия
+$zipFile->addFilesFromGlob($dir, $globPattern, $localPath, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFilesFromGlob($dir, $globPattern, $localPath, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFilesFromGlob($dir, $globPattern, $localPath, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addFilesFromGlobRecursive"></a> **ZipFile::addFilesFromGlobRecursive** - добавляет файлы из директории в соответствии с [glob шаблоном](https://en.wikipedia.org/wiki/Glob_(programming)) c вложенными директориями.
+```php
+$globPattern = '**.{jpg,jpeg,png,gif}'; // пример glob шаблона -> добавить все .jpg, .jpeg, .png и .gif файлы
+
+$zipFile->addFilesFromGlobRecursive($dir, $globPattern);
+
+// можно указать путь в архиве в который необходимо поместить записи
+$localPath = "to/path/";
+$zipFile->addFilesFromGlobRecursive($dir, $globPattern, $localPath);
+
+// можно указать метод сжатия
+$zipFile->addFilesFromGlobRecursive($dir, $globPattern, $localPath, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFilesFromGlobRecursive($dir, $globPattern, $localPath, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFilesFromGlobRecursive($dir, $globPattern, $localPath, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addFilesFromRegex"></a> **ZipFile::addFilesFromRegex** - добавляет файлы из директории в соответствии с [регулярным выражением](https://en.wikipedia.org/wiki/Regular_expression) без вложенных директорий.
+```php
+$regexPattern = '/\.(jpe?g|png|gif)$/si'; // пример регулярного выражения -> добавить все .jpg, .jpeg, .png и .gif файлы
+
+$zipFile->addFilesFromRegex($dir, $regexPattern);
+
+// можно указать путь в архиве в который необходимо поместить записи
+$localPath = "to/path/";
+$zipFile->addFilesFromRegex($dir, $regexPattern, $localPath);
+
+// можно указать метод сжатия
+$zipFile->addFilesFromRegex($dir, $regexPattern, $localPath, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFilesFromRegex($dir, $regexPattern, $localPath, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFilesFromRegex($dir, $regexPattern, $localPath, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+<a name="Documentation-ZipFile-addFilesFromRegexRecursive"></a> **ZipFile::addFilesFromRegexRecursive** - добавляет файлы из директории в соответствии с [регулярным выражением](https://en.wikipedia.org/wiki/Regular_expression) с вложенными директориями.
+```php
+$regexPattern = '/\.(jpe?g|png|gif)$/si'; // пример регулярного выражения -> добавить все .jpg, .jpeg, .png и .gif файлы
+
+$zipFile->addFilesFromRegexRecursive($dir, $regexPattern);
+
+// можно указать путь в архиве в который необходимо поместить записи
+$localPath = "to/path/";
+$zipFile->addFilesFromRegexRecursive($dir, $regexPattern, $localPath);
+
+// можно указать метод сжатия
+$zipFile->addFilesFromRegexRecursive($dir, $regexPattern, $localPath, ZipFile::METHOD_STORED); // Без сжатия
+$zipFile->addFilesFromRegexRecursive($dir, $regexPattern, $localPath, ZipFile::METHOD_DEFLATED); // Deflate сжатие
+$zipFile->addFilesFromRegexRecursive($dir, $regexPattern, $localPath, ZipFile::METHOD_BZIP2); // BZIP2 сжатие
+```
+#### <a name="Documentation-Remove-Zip-Entries"></a> Удаление записей из архива
+<a name="Documentation-ZipFile-deleteFromName"></a> **ZipFile::deleteFromName** - удаляет запись по имени.
+```php
+$zipFile->deleteFromName($entryName);
+```
+<a name="Documentation-ZipFile-deleteFromGlob"></a> **ZipFile::deleteFromGlob** - удаляет записи в соответствии с [glob шаблоном](https://en.wikipedia.org/wiki/Glob_(programming)).
+```php
+$globPattern = '**.{jpg,jpeg,png,gif}'; // пример glob шаблона -> удалить все .jpg, .jpeg, .png и .gif файлы
+
+$zipFile->deleteFromGlob($globPattern);
+```
+<a name="Documentation-ZipFile-deleteFromRegex"></a> **ZipFile::deleteFromRegex** - удаляет записи в соответствии с [регулярным выражением](https://en.wikipedia.org/wiki/Regular_expression).
+```php
+$regexPattern = '/\.(jpe?g|png|gif)$/si'; // пример регулярному выражения -> удалить все .jpg, .jpeg, .png и .gif файлы
+
+$zipFile->deleteFromRegex($regexPattern);
+```
+<a name="Documentation-ZipFile-deleteAll"></a> **ZipFile::deleteAll** - удаляет все записи в ZIP-архиве.
+```php
+$zipFile->deleteAll();
+```
+#### <a name="Documentation-Entries"></a> Работа с записями и с архивом
+<a name="Documentation-ZipFile-rename"></a> **ZipFile::rename** - переименовывает запись по имени.
+```php
+$zipFile->rename($oldName, $newName);
+```
+<a name="Documentation-ZipFile-setCompressionLevel"></a> **ZipFile::setCompressionLevel** - устанавливает уровень сжатия для всех файлов, находящихся в архиве.
+
+> _Обратите внимание, что действие данного метода не распространяется на записи, добавленные после выполнения этого метода._
+
+По умолчанию используется уровень сжатия -1 (`\PhpZip\ZipFile::LEVEL_DEFAULT_COMPRESSION`) или уровень сжатия, определённый в архиве для Deflate сжатия.
+
+Поддерживаются значения -1 (`\PhpZip\ZipFile::LEVEL_DEFAULT_COMPRESSION`) и диапазон от 1 (`\PhpZip\ZipFile::LEVEL_BEST_SPEED`) до 9 (`\PhpZip\ZipFile::LEVEL_BEST_COMPRESSION`). Чем выше число, тем лучше и дольше сжатие.
+```php
+$zipFile->setCompressionLevel(\PhpZip\ZipFile::LEVEL_BEST_COMPRESSION);
+```
+<a name="Documentation-ZipFile-setCompressionLevelEntry"></a> **ZipFile::setCompressionLevelEntry** - устанавливает уровень сжатия для определённой записи в архиве.
+
+Поддерживаются значения -1 (`\PhpZip\ZipFile::LEVEL_DEFAULT_COMPRESSION`) и диапазон от 1 (`\PhpZip\ZipFile::LEVEL_BEST_SPEED`) до 9 (`\PhpZip\ZipFile::LEVEL_BEST_COMPRESSION`). Чем выше число, тем лучше и дольше сжатие.
+```php
+$zipFile->setCompressionLevelEntry($entryName, \PhpZip\ZipFile::LEVEL_BEST_COMPRESSION);
+```
+<a name="Documentation-ZipFile-setCompressionMethodEntry"></a> **ZipFile::setCompressionMethodEntry** - устанавливает метод сжатия для определённой записи в архиве.
+
+Доступны следующие методы сжатия:
+- `\PhpZip\ZipFile::METHOD_STORED` - без сжатия
+- `\PhpZip\ZipFile::METHOD_DEFLATED` - Deflate сжатие
+- `\PhpZip\ZipFile::METHOD_BZIP2` - Bzip2 сжатие при наличии расширения `ext-bz2`
+```php
+$zipFile->setCompressionMethodEntry($entryName, ZipFile::METHOD_DEFLATED);
+```
+<a name="Documentation-ZipFile-setArchiveComment"></a> **ZipFile::setArchiveComment** - устанавливает комментарий к ZIP-архиву.
+```php
+$zipFile->setArchiveComment($commentArchive);
+```
+<a name="Documentation-ZipFile-setEntryComment"></a> **ZipFile::setEntryComment** - устанавливает комментарий к записи, используя её имя.
+```php
+$zipFile->setEntryComment($entryName, $comment);
+```
+<a name="Documentation-ZipFile-matcher"></a> **ZipFile::matcher** - выборка записей в архиве для проведения операций над выбранными записями.
+```php
+$matcher = $zipFile->matcher();
+```
+Выбор файлов из архива по одному:
+```php
+$matcher
+    ->add('entry name')
+    ->add('another entry');
+```
+Выбор нескольких файлов в архиве:
+```php
+$matcher->add([
+    'entry name',
+    'another entry name',
+    'path/'
+]);
+```
+Выбор файлов по регулярному выражению:
+```php
+$matcher->match('~\.jpe?g$~i');
+```
+Выбор всех файлов в архиве:
+```php
+$matcher->all();
+```
+count() - получает количество выбранных записей:
+```php
+$count = count($matcher);
+// или
+$count = $matcher->count();
+```
+getMatches() - получает список выбранных записей:
+```php
+$entries = $matcher->getMatches();
+// пример содержимого: ['entry name', 'another entry name'];
+```
+invoke() - выполняет пользовательскую функцию над выбранными записями:
+```php
+// пример
+$matcher->invoke(function($entryName) use($zipFile) {
+    $newName = preg_replace('~\.(jpe?g)$~i', '.no_optimize.$1', $entryName);
+    $zipFile->rename($entryName, $newName);
+});
+```
+Функции для работы над выбранными записями:
+```php
+$matcher->delete(); // удалет выбранные записи из ZIP-архива
+$matcher->setPassword($password); // устанавливает новый пароль на выбранные записи
+$matcher->setPassword($password, $encryptionMethod); // устанавливает новый пароль и метод шифрования на выбранные записи
+$matcher->setEncryptionMethod($encryptionMethod); // устанавливает метод шифрования на выбранные записи
+$matcher->disableEncryption(); // отключает шифрование для выбранных записей
+```
+#### <a name="Documentation-Password"></a> Работа с паролями
+
+Реализована поддержка методов шифрования:
+- `\PhpZip\ZipFile::ENCRYPTION_METHOD_TRADITIONAL` - Traditional PKWARE encryption
+- `\PhpZip\ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256` - WinZip AES encryption 256 bit (рекомендуемое)
+- `\PhpZip\ZipFile::ENCRYPTION_METHOD_WINZIP_AES_192` - WinZip AES encryption 192 bit
+- `\PhpZip\ZipFile::ENCRYPTION_METHOD_WINZIP_AES_128` - WinZip AES encryption 128 bit
+
+<a name="Documentation-ZipFile-setReadPassword"></a> **ZipFile::setReadPassword** - устанавливает пароль на чтение открытого запароленного архива для всех зашифрованных записей.
+
+> _Установка пароля не является обязательной для добавления новых записей или удаления существующих, но если вы захотите извлечь контент или изменить метод/уровень сжатия, метод шифрования или изменить пароль, то в этом случае пароль необходимо указать._
+```php
+$zipFile->setReadPassword($password);
+```
+<a name="Documentation-ZipFile-setReadPasswordEntry"></a> **ZipFile::setReadPasswordEntry** - устанавливает пароль на чтение конкретной зашифрованной записи открытого запароленного архива.
+```php
+$zipFile->setReadPasswordEntry($entryName, $password);
+```
+<a name="Documentation-ZipFile-setPassword"></a> **ZipFile::setPassword** - устанавливает новый пароль для всех файлов, находящихся в архиве.
+
+> _Обратите внимание, что действие данного метода не распространяется на записи, добавленные после выполнения этого метода._
+```php
+$zipFile->setPassword($password);
+```
+Можно установить метод шифрования:
+```php
+$encryptionMethod = ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256;
+$zipFile->setPassword($password, $encryptionMethod);
+```
+<a name="Documentation-ZipFile-setPasswordEntry"></a> **ZipFile::setPasswordEntry** - устанавливает новый пароль для конкретного файла.
+```php
+$zipFile->setPasswordEntry($entryName, $password);
+```
+Можно установить метод шифрования:
+```php
+$encryptionMethod = ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256;
+$zipFile->setPasswordEntry($entryName, $password, $encryptionMethod);
+```
+<a name="Documentation-ZipFile-disableEncryption"></a> **ZipFile::disableEncryption** - отключает шифрования всех записей, находящихся в архиве.
+
+> _Обратите внимание, что действие данного метода не распространяется на записи, добавленные после выполнения этого метода._
+```php
+$zipFile->disableEncryption();
+```
+<a name="Documentation-ZipFile-disableEncryptionEntry"></a> **ZipFile::disableEncryptionEntry** - отключает шифрование записи по её имени.
+```php
+$zipFile->disableEncryptionEntry($entryName);
+```
+#### <a name="Documentation-ZipAlign-Usage"></a> zipalign
+<a name="Documentation-ZipFile-setZipAlign"></a> **ZipFile::setZipAlign** - устанавливает выравнивание архива для оптимизации APK файлов (Android packages).
+
+Метод добавляет паддинги незашифрованным и не сжатым записям, для оптимизации расхода памяти в системе Android. Рекомендуется использовать для `APK` файлов. Файл может незначительно увеличиться.
+
+Этот метод является альтернативой вызова команды `zipalign -f -v 4 filename.zip`.
+
+Подробнее можно ознакомиться по [ссылке](https://developer.android.com/studio/command-line/zipalign.html).
+```php
+// вызовите до сохранения или вывода архива
+$zipFile->setZipAlign(4);
+```
+#### <a name="Documentation-Unchanged"></a> Отмена изменений
+<a name="Documentation-ZipFile-unchangeAll"></a> **ZipFile::unchangeAll** - отменяет все изменения, сделанные в архиве.
+```php
+$zipFile->unchangeAll();
+```
+<a name="Documentation-ZipFile-unchangeArchiveComment"></a> **ZipFile::unchangeArchiveComment** - отменяет изменения в комментарии к архиву.
+```php
+$zipFile->unchangeArchiveComment();
+```
+<a name="Documentation-ZipFile-unchangeEntry"></a> **ZipFile::unchangeEntry** - отменяет изменения для конкретной записи архива.
+```php
+$zipFile->unchangeEntry($entryName);
+```
+#### <a name="Documentation-Save-Or-Output-Entries"></a> Сохранение файла или вывод в браузер
+<a name="Documentation-ZipFile-saveAsFile"></a> **ZipFile::saveAsFile** - сохраняет архив в файл.
+```php
+$zipFile->saveAsFile($filename);
+```
+<a name="Documentation-ZipFile-saveAsStream"></a> **ZipFile::saveAsStream** - записывает архив в поток.
+```php
+// $fp = fopen($filename, 'w+b');
+
+$zipFile->saveAsStream($fp);
+```
+<a name="Documentation-ZipFile-outputAsString"></a> **ZipFile::outputAsString** - выводит ZIP-архив в виде строки.
+```php
+$rawZipArchiveBytes = $zipFile->outputAsString();
+```
+<a name="Documentation-ZipFile-outputAsAttachment"></a> **ZipFile::outputAsAttachment** - выводит ZIP-архив в браузер.
+
+При выводе устанавливаются необходимые заголовки, а после вывода завершается работа скрипта.
+```php
+$zipFile->outputAsAttachment($outputFilename);
+```
+Можно установить MIME-тип:
+```php
+$mimeType = 'application/zip'
+$zipFile->outputAsAttachment($outputFilename, $mimeType);
+```
+<a name="Documentation-ZipFile-outputAsResponse"></a> **ZipFile::outputAsResponse** - выводит ZIP-архив, как Response [PSR-7](http://www.php-fig.org/psr/psr-7/).
+
+Метод вывода может использоваться в любом PSR-7 совместимом фреймворке. 
+```php
+// $response = ....; // instance Psr\Http\Message\ResponseInterface
+$zipFile->outputAsResponse($response, $outputFilename);
+```
+Можно установить MIME-тип:
+```php
+$mimeType = 'application/zip'
+$zipFile->outputAsResponse($response, $outputFilename, $mimeType);
+```
+Пример для Slim Framework:
+```php
+$app = new \Slim\App;
+$app->get('/download', function ($req, $res, $args) {
+    $zipFile = new \PhpZip\ZipFile();
+    $zipFile['file.txt'] = 'content';
+    return $zipFile->outputAsResponse($res, 'file.zip');
+});
+$app->run();
+```
+<a name="Documentation-ZipFile-rewrite"></a> **ZipFile::rewrite** - сохраняет изменения и заново открывает изменившийся архив.
+```php
+$zipFile->rewrite();
+```
+#### <a name="Documentation-Close-Zip-Archive"></a> Закрытие архива
+<a name="Documentation-ZipFile-close"></a> **ZipFile::close** - закрывает ZIP-архив.
+```php
+$zipFile->close();
+```
+### <a name="Running-Tests"></a> Запуск тестов
+Установите зависимости для разработки.
+```bash
+composer install --dev
+```
+Запустите тесты:
+```bash
+vendor/bin/phpunit -v -c phpunit.xml
+```
+### <a name="Changelog"></a> История изменений
+[Ссылка на Changelog](CHANGELOG.md)
+### <a name="Upgrade"></a> Обновление версий
+#### <a name="Upgrade-v2-to-v3"></a> Обновление с версии 2 до версии 3.0
+Обновите мажорную версию в файле `composer.json` до `^3.0`.
+```json
+{
+    "require": {
+        "nelexa/zip": "^3.0"
+    }
+}
+```
+Затем установите обновления с помощью `Composer`:
+```bash
+composer update nelexa/zip
+```
+Обновите ваш код для работы с новой версией:
+- Класс `ZipOutputFile` объединён с `ZipFile` и удалён.
+  + Замените `new \PhpZip\ZipOutputFile()` на `new \PhpZip\ZipFile()`
+- Статичиская инициализация методов стала не статической.
+  + Замените `\PhpZip\ZipFile::openFromFile($filename);` на `(new \PhpZip\ZipFile())->openFile($filename);`
+  + Замените `\PhpZip\ZipOutputFile::openFromFile($filename);` на `(new \PhpZip\ZipFile())->openFile($filename);`
+  + Замените `\PhpZip\ZipFile::openFromString($contents);` на `(new \PhpZip\ZipFile())->openFromString($contents);`
+  + Замените `\PhpZip\ZipFile::openFromStream($stream);` на `(new \PhpZip\ZipFile())->openFromStream($stream);`
+  + Замените `\PhpZip\ZipOutputFile::create()` на `new \PhpZip\ZipFile()`
+  + Замените `\PhpZip\ZipOutputFile::openFromZipFile($zipFile)` на `(new \PhpZip\ZipFile())->openFile($filename);`
+- Переименуйте методы:
+  + `addFromFile` в `addFile`
+  + `setLevel` в `setCompressionLevel`
+  + `ZipFile::setPassword` в `ZipFile::withReadPassword`
+  + `ZipOutputFile::setPassword` в `ZipFile::withNewPassword`
+  + `ZipOutputFile::disableEncryptionAllEntries` в `ZipFile::withoutPassword`
+  + `ZipOutputFile::setComment` в `ZipFile::setArchiveComment`
+  + `ZipFile::getComment` в `ZipFile::getArchiveComment`
+- Изменились сигнатуры для методов `addDir`, `addFilesFromGlob`, `addFilesFromRegex`.
+- Удалены методы:
+  + `getLevel`
+  + `setCompressionMethod`
+  + `setEntryPassword`

bootstrap.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-
-    <testsuites>
-        <testsuite name="PhpZip test suite">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>

composer.json

@@ -1,38 +1,60 @@
 {
-  "name": "nelexa/zip",
-  "description": "Zip files CRUD. Open, create, update, extract and get info tool. Supports appending to existing ZIP files, WinZip AES encryption, Traditional PKWARE Encryption, ZipAlign tool, BZIP2 compression, external file attributes and ZIP64 extensions. Alternative ZipArchive. It does not require php-zip extension.",
-  "type": "library",
-  "keywords": [
-    "zip",
-    "archive",
-    "extract",
-    "winzip",
-    "zipalign"
-  ],
-  "require-dev": {
-    "phpunit/phpunit": "4.8"
-  },
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Ne-Lexa",
-      "email": "alexey@nelexa.ru",
-      "role": "Developer"
+    "name": "nelexa/zip",
+    "type": "library",
+    "description": "PhpZip is a php-library for extended work with ZIP-archives. Open, create, update, delete, extract and get info tool. Supports appending to existing ZIP files, WinZip AES encryption, Traditional PKWARE Encryption, ZipAlign tool, BZIP2 compression, external file attributes and ZIP64 extensions. Alternative ZipArchive. It does not require php-zip extension.",
+    "keywords": [
+        "zip",
+        "unzip",
+        "archive",
+        "extract",
+        "winzip",
+        "zipalign",
+        "ziparchive"
+    ],
+    "homepage": "https://github.com/Ne-Lexa/php-zip",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Ne-Lexa",
+            "email": "alexey@nelexa.ru",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": "^5.5 || ^7.0",
+        "ext-zlib": "*",
+        "psr/http-message": "^1.0",
+        "paragonie/random_compat": ">=1 <9.99"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8|^5.7",
+        "zendframework/zend-diactoros": "^1.4"
+    },
+    "autoload": {
+        "psr-4": {
+            "PhpZip\\": "src/PhpZip"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "PhpZip\\": "tests/PhpZip"
+        }
+    },
+    "suggest": {
+        "ext-openssl": "Needed to support encrypt zip entries or use ext-mcrypt",
+        "ext-mcrypt": "Needed to support encrypt zip entries or use ext-openssl",
+        "ext-bz2": "Needed to support BZIP2 compression",
+        "ext-fileinfo": "Needed to get mime-type file"
+    },
+    "minimum-stability": "stable",
+    "scripts": {
+        "php:fix": "php .php_cs --force",
+        "php:fix:debug": "php .php_cs"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.1.x-dev",
+            "dev-develop": "3.2.x-dev"
+        }
     }
-  ],
-  "minimum-stability": "stable",
-  "require": {
-    "php-64bit": "^5.4 || ^7.0",
-    "ext-mbstring": "*"
-  },
-  "autoload": {
-    "psr-4": {
-      "": "src/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "": "tests/"
-    }
-  }
 }

phpunit.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php">
+    <php>
+        <ini name="error_reporting" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="PhpZip test suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>src</directory>
+        </whitelist>
+    </filter>
+</phpunit>

src/PhpZip/Crypto/TraditionalPkwareEncryptionEngine.php

@@ -1,74 +1,298 @@
 <?php
+
 namespace PhpZip\Crypto;
 
+use PhpZip\Exception\RuntimeException;
 use PhpZip\Exception\ZipAuthenticationException;
+use PhpZip\Exception\ZipCryptoException;
 use PhpZip\Model\ZipEntry;
-use PhpZip\Util\CryptoUtil;
+use PhpZip\Util\PackUtil;
 
 /**
  * Traditional PKWARE Encryption Engine.
  *
  * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
  */
-class TraditionalPkwareEncryptionEngine
+class TraditionalPkwareEncryptionEngine implements ZipEncryptionEngine
 {
-    /**
-     * Encryption header size
-     */
+    /** Encryption header size */
     const STD_DEC_HDR_SIZE = 12;
 
     /**
-     * Crc table
+     * Crc table.
      *
      * @var array
      */
     private static $CRC_TABLE = [
-        0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
-        0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
-        0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-        0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
-        0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-        0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-        0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
-        0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
-        0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-        0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-        0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
-        0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-        0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
-        0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
-        0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-        0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
-        0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
-        0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-        0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
-        0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-        0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-        0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
-        0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
-        0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-        0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-        0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
-        0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-        0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
-        0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
-        0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-        0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
-        0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+        0x00000000,
+        0x77073096,
+        0xee0e612c,
+        0x990951ba,
+        0x076dc419,
+        0x706af48f,
+        0xe963a535,
+        0x9e6495a3,
+        0x0edb8832,
+        0x79dcb8a4,
+        0xe0d5e91e,
+        0x97d2d988,
+        0x09b64c2b,
+        0x7eb17cbd,
+        0xe7b82d07,
+        0x90bf1d91,
+        0x1db71064,
+        0x6ab020f2,
+        0xf3b97148,
+        0x84be41de,
+        0x1adad47d,
+        0x6ddde4eb,
+        0xf4d4b551,
+        0x83d385c7,
+        0x136c9856,
+        0x646ba8c0,
+        0xfd62f97a,
+        0x8a65c9ec,
+        0x14015c4f,
+        0x63066cd9,
+        0xfa0f3d63,
+        0x8d080df5,
+        0x3b6e20c8,
+        0x4c69105e,
+        0xd56041e4,
+        0xa2677172,
+        0x3c03e4d1,
+        0x4b04d447,
+        0xd20d85fd,
+        0xa50ab56b,
+        0x35b5a8fa,
+        0x42b2986c,
+        0xdbbbc9d6,
+        0xacbcf940,
+        0x32d86ce3,
+        0x45df5c75,
+        0xdcd60dcf,
+        0xabd13d59,
+        0x26d930ac,
+        0x51de003a,
+        0xc8d75180,
+        0xbfd06116,
+        0x21b4f4b5,
+        0x56b3c423,
+        0xcfba9599,
+        0xb8bda50f,
+        0x2802b89e,
+        0x5f058808,
+        0xc60cd9b2,
+        0xb10be924,
+        0x2f6f7c87,
+        0x58684c11,
+        0xc1611dab,
+        0xb6662d3d,
+        0x76dc4190,
+        0x01db7106,
+        0x98d220bc,
+        0xefd5102a,
+        0x71b18589,
+        0x06b6b51f,
+        0x9fbfe4a5,
+        0xe8b8d433,
+        0x7807c9a2,
+        0x0f00f934,
+        0x9609a88e,
+        0xe10e9818,
+        0x7f6a0dbb,
+        0x086d3d2d,
+        0x91646c97,
+        0xe6635c01,
+        0x6b6b51f4,
+        0x1c6c6162,
+        0x856530d8,
+        0xf262004e,
+        0x6c0695ed,
+        0x1b01a57b,
+        0x8208f4c1,
+        0xf50fc457,
+        0x65b0d9c6,
+        0x12b7e950,
+        0x8bbeb8ea,
+        0xfcb9887c,
+        0x62dd1ddf,
+        0x15da2d49,
+        0x8cd37cf3,
+        0xfbd44c65,
+        0x4db26158,
+        0x3ab551ce,
+        0xa3bc0074,
+        0xd4bb30e2,
+        0x4adfa541,
+        0x3dd895d7,
+        0xa4d1c46d,
+        0xd3d6f4fb,
+        0x4369e96a,
+        0x346ed9fc,
+        0xad678846,
+        0xda60b8d0,
+        0x44042d73,
+        0x33031de5,
+        0xaa0a4c5f,
+        0xdd0d7cc9,
+        0x5005713c,
+        0x270241aa,
+        0xbe0b1010,
+        0xc90c2086,
+        0x5768b525,
+        0x206f85b3,
+        0xb966d409,
+        0xce61e49f,
+        0x5edef90e,
+        0x29d9c998,
+        0xb0d09822,
+        0xc7d7a8b4,
+        0x59b33d17,
+        0x2eb40d81,
+        0xb7bd5c3b,
+        0xc0ba6cad,
+        0xedb88320,
+        0x9abfb3b6,
+        0x03b6e20c,
+        0x74b1d29a,
+        0xead54739,
+        0x9dd277af,
+        0x04db2615,
+        0x73dc1683,
+        0xe3630b12,
+        0x94643b84,
+        0x0d6d6a3e,
+        0x7a6a5aa8,
+        0xe40ecf0b,
+        0x9309ff9d,
+        0x0a00ae27,
+        0x7d079eb1,
+        0xf00f9344,
+        0x8708a3d2,
+        0x1e01f268,
+        0x6906c2fe,
+        0xf762575d,
+        0x806567cb,
+        0x196c3671,
+        0x6e6b06e7,
+        0xfed41b76,
+        0x89d32be0,
+        0x10da7a5a,
+        0x67dd4acc,
+        0xf9b9df6f,
+        0x8ebeeff9,
+        0x17b7be43,
+        0x60b08ed5,
+        0xd6d6a3e8,
+        0xa1d1937e,
+        0x38d8c2c4,
+        0x4fdff252,
+        0xd1bb67f1,
+        0xa6bc5767,
+        0x3fb506dd,
+        0x48b2364b,
+        0xd80d2bda,
+        0xaf0a1b4c,
+        0x36034af6,
+        0x41047a60,
+        0xdf60efc3,
+        0xa867df55,
+        0x316e8eef,
+        0x4669be79,
+        0xcb61b38c,
+        0xbc66831a,
+        0x256fd2a0,
+        0x5268e236,
+        0xcc0c7795,
+        0xbb0b4703,
+        0x220216b9,
+        0x5505262f,
+        0xc5ba3bbe,
+        0xb2bd0b28,
+        0x2bb45a92,
+        0x5cb36a04,
+        0xc2d7ffa7,
+        0xb5d0cf31,
+        0x2cd99e8b,
+        0x5bdeae1d,
+        0x9b64c2b0,
+        0xec63f226,
+        0x756aa39c,
+        0x026d930a,
+        0x9c0906a9,
+        0xeb0e363f,
+        0x72076785,
+        0x05005713,
+        0x95bf4a82,
+        0xe2b87a14,
+        0x7bb12bae,
+        0x0cb61b38,
+        0x92d28e9b,
+        0xe5d5be0d,
+        0x7cdcefb7,
+        0x0bdbdf21,
+        0x86d3d2d4,
+        0xf1d4e242,
+        0x68ddb3f8,
+        0x1fda836e,
+        0x81be16cd,
+        0xf6b9265b,
+        0x6fb077e1,
+        0x18b74777,
+        0x88085ae6,
+        0xff0f6a70,
+        0x66063bca,
+        0x11010b5c,
+        0x8f659eff,
+        0xf862ae69,
+        0x616bffd3,
+        0x166ccf45,
+        0xa00ae278,
+        0xd70dd2ee,
+        0x4e048354,
+        0x3903b3c2,
+        0xa7672661,
+        0xd06016f7,
+        0x4969474d,
+        0x3e6e77db,
+        0xaed16a4a,
+        0xd9d65adc,
+        0x40df0b66,
+        0x37d83bf0,
+        0xa9bcae53,
+        0xdebb9ec5,
+        0x47b2cf7f,
+        0x30b5ffe9,
+        0xbdbdf21c,
+        0xcabac28a,
+        0x53b39330,
+        0x24b4a3a6,
+        0xbad03605,
+        0xcdd70693,
+        0x54de5729,
+        0x23d967bf,
+        0xb3667a2e,
+        0xc4614ab8,
+        0x5d681b02,
+        0x2a6f2b94,
+        0xb40bbe37,
+        0xc30c8ea1,
+        0x5a05df1b,
+        0x2d02ef8d,
     ];
 
     /**
-     * Encryption keys
+     * Encryption keys.
      *
      * @var array
      */
     private $keys = [];
 
-    /**
-     * @var ZipEntry
-     */
+    /** @var ZipEntry */
     private $entry;
 
     /**
@@ -79,11 +303,10 @@ class TraditionalPkwareEncryptionEngine
     public function __construct(ZipEntry $entry)
     {
         $this->entry = $entry;
-        $this->initKeys($entry->getPassword());
     }
 
     /**
-     * Initial keys
+     * Initial keys.
      *
      * @param string $password
      */
@@ -92,6 +315,7 @@ class TraditionalPkwareEncryptionEngine
         $this->keys[0] = 305419896;
         $this->keys[1] = 591751049;
         $this->keys[2] = 878082192;
+
         foreach (unpack('C*', $password) as $b) {
             $this->updateKeys($b);
         }
@@ -100,21 +324,22 @@ class TraditionalPkwareEncryptionEngine
     /**
      * Update keys.
      *
-     * @param string $charAt
+     * @param int $charAt
      */
     private function updateKeys($charAt)
     {
-        $this->keys[0] = self::crc32($this->keys[0], $charAt);
-        $this->keys[1] = ($this->keys[1] + ($this->keys[0] & 0xff)) & 4294967295;
-        $this->keys[1] = ($this->keys[1] * 134775813 + 1) & 4294967295;
-        $this->keys[2] = self::crc32($this->keys[2], ($this->keys[1] >> 24) & 0xff);
+        $this->keys[0] = $this->crc32($this->keys[0], $charAt);
+        $this->keys[1] += ($this->keys[0] & 0xff);
+        $this->keys[1] = PackUtil::toSignedInt32($this->keys[1] * 134775813 + 1);
+        $this->keys[2] = PackUtil::toSignedInt32($this->crc32($this->keys[2], ($this->keys[1] >> 24) & 0xff));
     }
 
     /**
      * Update crc.
      *
      * @param int $oldCrc
-     * @param string $charAt
+     * @param int $charAt
+     *
      * @return int
      */
     private function crc32($oldCrc, $charAt)
@@ -124,34 +349,53 @@ class TraditionalPkwareEncryptionEngine
 
     /**
      * @param string $content
-     * @return string
+     *
      * @throws ZipAuthenticationException
+     *
+     * @return string
      */
     public function decrypt($content)
     {
+        if (\PHP_INT_SIZE === 4) {
+            throw new RuntimeException('Traditional PKWARE Encryption is not supported in 32-bit PHP.');
+        }
+
+        $password = $this->entry->getPassword();
+        $this->initKeys($password);
+
         $headerBytes = array_values(unpack('C*', substr($content, 0, self::STD_DEC_HDR_SIZE)));
-        foreach ($headerBytes as &$byte) {
-            $byte = ($byte ^ $this->decryptByte()) & 0xff;
+        $byte = 0;
+
+        for ($i = 0; $i < self::STD_DEC_HDR_SIZE; $i++) {
+            $byte = ($headerBytes[$i] ^ $this->decryptByte()) & 0xff;
             $this->updateKeys($byte);
         }
 
         if ($this->entry->getGeneralPurposeBitFlag(ZipEntry::GPBF_DATA_DESCRIPTOR)) {
             // compare against the file type from extended local headers
-            $checkByte = ($this->entry->getRawTime() >> 8) & 0xff;
+            $checkByte = ($this->entry->getDosTime() >> 8) & 0xff;
         } else {
             // compare against the CRC otherwise
             $checkByte = ($this->entry->getCrc() >> 24) & 0xff;
         }
-        if ($headerBytes[11] !== $checkByte) {
-            throw new ZipAuthenticationException("Bad password for entry " . $this->entry->getName());
+
+        if ($byte !== $checkByte) {
+            throw new ZipAuthenticationException(
+                sprintf(
+                    'Invalid password for zip entry "%s"',
+                    $this->entry->getName()
+                )
+            );
         }
 
-        $outputContent = "";
+        $outputContent = '';
+
         foreach (unpack('C*', substr($content, self::STD_DEC_HDR_SIZE)) as $val) {
             $val = ($val ^ $this->decryptByte()) & 0xff;
             $this->updateKeys($val);
             $outputContent .= pack('c', $val);
         }
+
         return $outputContent;
     }
 
@@ -163,53 +407,78 @@ class TraditionalPkwareEncryptionEngine
     private function decryptByte()
     {
         $temp = $this->keys[2] | 2;
+
         return (($temp * ($temp ^ 1)) >> 8) & 0xffffff;
     }
 
     /**
-     * Encryption data
+     * Encryption data.
      *
      * @param string $data
-     * @param int $crc
+     *
+     * @throws ZipCryptoException
+     *
      * @return string
      */
-    public function encrypt($data, $crc)
+    public function encrypt($data)
     {
-        $headerBytes = CryptoUtil::randomBytes(self::STD_DEC_HDR_SIZE);
+        if (\PHP_INT_SIZE === 4) {
+            throw new RuntimeException('Traditional PKWARE Encryption is not supported in 32-bit PHP.');
+        }
+
+        $crc = $this->entry->isDataDescriptorRequired() ?
+            ($this->entry->getDosTime() & 0x0000ffff) << 16 :
+            $this->entry->getCrc();
+
+        try {
+            $headerBytes = random_bytes(self::STD_DEC_HDR_SIZE);
+        } catch (\Exception $e) {
+            throw new \RuntimeException('Oops, our server is bust and cannot generate any random data.', 1, $e);
+        }
 
         // Initialize again since the generated bytes were encrypted.
-        $this->initKeys($this->entry->getPassword());
+        $password = $this->entry->getPassword();
+        $this->initKeys($password);
+
         $headerBytes[self::STD_DEC_HDR_SIZE - 1] = pack('c', ($crc >> 24) & 0xff);
         $headerBytes[self::STD_DEC_HDR_SIZE - 2] = pack('c', ($crc >> 16) & 0xff);
 
         $headerBytes = $this->encryptData($headerBytes);
+
         return $headerBytes . $this->encryptData($data);
     }
 
     /**
      * @param string $content
+     *
+     * @throws ZipCryptoException
+     *
      * @return string
      */
     private function encryptData($content)
     {
         if ($content === null) {
-            throw new \RuntimeException();
+            throw new ZipCryptoException('content is null');
         }
         $buff = '';
+
         foreach (unpack('C*', $content) as $val) {
             $buff .= pack('c', $this->encryptByte($val));
         }
+
         return $buff;
     }
 
     /**
      * @param int $byte
+     *
      * @return int
      */
-    protected function encryptByte($byte)
+    private function encryptByte($byte)
     {
         $tempVal = $byte ^ $this->decryptByte() & 0xff;
         $this->updateKeys($byte);
+
         return $tempVal;
     }
-}
+}

src/PhpZip/Crypto/WinZipAesEngine.php

@@ -1,37 +1,41 @@
 <?php
+
 namespace PhpZip\Crypto;
 
+use PhpZip\Exception\RuntimeException;
 use PhpZip\Exception\ZipAuthenticationException;
 use PhpZip\Exception\ZipCryptoException;
-use PhpZip\Extra\WinZipAesEntryExtraField;
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
 use PhpZip\Model\ZipEntry;
-use PhpZip\Util\CryptoUtil;
 
 /**
  * WinZip Aes Encryption Engine.
  *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
  */
-class WinZipAesEngine
+class WinZipAesEngine implements ZipEncryptionEngine
 {
     /**
      * The block size of the Advanced Encryption Specification (AES) Algorithm
      * in bits (AES_BLOCK_SIZE_BITS).
      */
     const AES_BLOCK_SIZE_BITS = 128;
+
     const PWD_VERIFIER_BITS = 16;
-    /**
-     * The iteration count for the derived keys of the cipher, KLAC and MAC.
-     */
+
+    /** The iteration count for the derived keys of the cipher, KLAC and MAC. */
     const ITERATION_COUNT = 1000;
-    /**
-     * @var ZipEntry
-     */
+
+    /** @var ZipEntry */
     private $entry;
 
     /**
      * WinZipAesEngine constructor.
+     *
      * @param ZipEntry $entry
      */
     public function __construct(ZipEntry $entry)
@@ -42,103 +46,129 @@ class WinZipAesEngine
     /**
      * Decrypt from stream resource.
      *
-     * @param resource $stream Input stream resource
-     * @return string
+     * @param string $content Input stream buffer
+     *
+     * @throws ZipException
      * @throws ZipAuthenticationException
      * @throws ZipCryptoException
+     *
+     * @return string
      */
-    public function decrypt($stream)
+    public function decrypt($content)
     {
+        $extraFieldsCollection = $this->entry->getExtraFieldsCollection();
+
+        if (!isset($extraFieldsCollection[WinZipAesEntryExtraField::getHeaderId()])) {
+            throw new ZipCryptoException($this->entry->getName() . ' (missing extra field for WinZip AES entry)');
+        }
+
         /**
          * @var WinZipAesEntryExtraField $field
          */
-        $field = $this->entry->getExtraField(WinZipAesEntryExtraField::getHeaderId());
-        if (null === $field) {
-            throw new ZipCryptoException($this->entry->getName() . " (missing extra field for WinZip AES entry)");
-        }
-
-        $pos = ftell($stream);
+        $field = $extraFieldsCollection[WinZipAesEntryExtraField::getHeaderId()];
 
         // Get key strength.
         $keyStrengthBits = $field->getKeyStrength();
         $keyStrengthBytes = $keyStrengthBits / 8;
 
-        $salt = fread($stream, $keyStrengthBytes / 2);
-        $passwordVerifier = fread($stream, self::PWD_VERIFIER_BITS / 8);
+        $pos = $keyStrengthBytes / 2;
+        $salt = substr($content, 0, $pos);
+        $passwordVerifier = substr($content, $pos, self::PWD_VERIFIER_BITS / 8);
+        $pos += self::PWD_VERIFIER_BITS / 8;
 
         $sha1Size = 20;
 
         // Init start, end and size of encrypted data.
-        $endPos = $pos + $this->entry->getCompressedSize();
-        $start = ftell($stream);
+        $start = $pos;
+        $endPos = \strlen($content);
         $footerSize = $sha1Size / 2;
         $end = $endPos - $footerSize;
         $size = $end - $start;
 
-        if (0 > $size) {
-            throw new ZipCryptoException($this->entry->getName() . " (false positive WinZip AES entry is too short)");
+        if ($size < 0) {
+            throw new ZipCryptoException($this->entry->getName() . ' (false positive WinZip AES entry is too short)');
         }
 
         // Load authentication code.
-        fseek($stream, $end, SEEK_SET);
-        $authenticationCode = fread($stream, $footerSize);
-        if (ftell($stream) !== $endPos) {
+        $authenticationCode = substr($content, $end, $footerSize);
+
+        if ($end + $footerSize !== $endPos) {
             // This should never happen unless someone is writing to the
             // end of the file concurrently!
-            throw new ZipCryptoException("Expected end of file after WinZip AES authentication code!");
+            throw new ZipCryptoException('Expected end of file after WinZip AES authentication code!');
         }
 
-        do {
-            assert($this->entry->getPassword() !== null);
-            assert(self::AES_BLOCK_SIZE_BITS <= $keyStrengthBits);
+        $password = $this->entry->getPassword();
 
+        if ($password === null) {
+            throw new ZipException(sprintf('Password not set for entry %s', $this->entry->getName()));
+        }
+
+        /**
+         * WinZip 99-character limit.
+         *
+         * @see https://sourceforge.net/p/p7zip/discussion/383044/thread/c859a2f0/
+         */
+        $password = substr($password, 0, 99);
+        $ctrIvSize = self::AES_BLOCK_SIZE_BITS / 8;
+        $iv = str_repeat(\chr(0), $ctrIvSize);
+
+        do {
             // Here comes the strange part about WinZip AES encryption:
             // Its unorthodox use of the Password-Based Key Derivation
             // Function 2 (PBKDF2) of PKCS #5 V2.0 alias RFC 2898.
             // Yes, the password verifier is only a 16 bit value.
             // So we must use the MAC for password verification, too.
-            $keyParam = hash_pbkdf2("sha1", $this->entry->getPassword(), $salt, self::ITERATION_COUNT, (2 * $keyStrengthBits + self::PWD_VERIFIER_BITS) / 8, true);
-            $ctrIvSize = self::AES_BLOCK_SIZE_BITS / 8;
-            $iv = str_repeat(chr(0), $ctrIvSize);
-
+            $keyParam = hash_pbkdf2(
+                'sha1',
+                $password,
+                $salt,
+                self::ITERATION_COUNT,
+                (2 * $keyStrengthBits + self::PWD_VERIFIER_BITS) / 8,
+                true
+            );
             $key = substr($keyParam, 0, $keyStrengthBytes);
-
             $sha1MacParam = substr($keyParam, $keyStrengthBytes, $keyStrengthBytes);
             // Verify password.
         } while (!$passwordVerifier === substr($keyParam, 2 * $keyStrengthBytes));
 
-        $content = stream_get_contents($stream, $size, $start);
+        $content = substr($content, $start, $size);
         $mac = hash_hmac('sha1', $content, $sha1MacParam, true);
 
-        if ($authenticationCode !== substr($mac, 0, 10)) {
-            throw new ZipAuthenticationException($this->entry->getName() . " (authenticated WinZip AES entry content has been tampered with)");
+        if (strpos($mac, $authenticationCode) !== 0) {
+            throw new ZipAuthenticationException(
+                $this->entry->getName() .
+                ' (authenticated WinZip AES entry content has been tampered with)'
+            );
         }
 
-        return self::aesCtrSegmentIntegerCounter(false, $content, $key, $iv);
+        return self::aesCtrSegmentIntegerCounter($content, $key, $iv, false);
     }
 
     /**
      * Decryption or encryption AES-CTR with Segment Integer Count (SIC).
      *
-     * @param bool $encrypted If true encryption else decryption
-     * @param string $str Data
-     * @param string $key Key
-     * @param string $iv IV
+     * @param string $str       Data
+     * @param string $key       Key
+     * @param string $iv        IV
+     * @param bool   $encrypted If true encryption else decryption
+     *
      * @return string
      */
-    private static function aesCtrSegmentIntegerCounter($encrypted = true, $str, $key, $iv)
+    private static function aesCtrSegmentIntegerCounter($str, $key, $iv, $encrypted = true)
     {
-        $numOfBlocks = ceil(strlen($str) / 16);
+        $numOfBlocks = ceil(\strlen($str) / 16);
         $ctrStr = '';
         for ($i = 0; $i < $numOfBlocks; ++$i) {
             for ($j = 0; $j < 16; ++$j) {
-                $n = ord($iv[$j]);
+                $n = \ord($iv[$j]);
+
                 if (++$n === 0x100) {
                     // overflow, set this one to 0, increment next
-                    $iv[$j] = chr(0);
+                    $iv[$j] = \chr(0);
                 } else {
                     // no overflow, just write incremented number back and abort
-                    $iv[$j] = chr($n);
+                    $iv[$j] = \chr($n);
                     break;
                 }
             }
@@ -147,6 +177,7 @@ class WinZipAesEngine
                 self::encryptCtr($data, $key, $iv) :
                 self::decryptCtr($data, $key, $iv);
         }
+
         return $ctrStr;
     }
 
@@ -154,78 +185,111 @@ class WinZipAesEngine
      * Encrypt AES-CTR.
      *
      * @param string $data Raw data
-     * @param string $key Aes key
-     * @param string $iv Aes IV
+     * @param string $key  Aes key
+     * @param string $iv   Aes IV
+     *
      * @return string Encrypted data
      */
     private static function encryptCtr($data, $key, $iv)
     {
-        if (extension_loaded("openssl")) {
-            $numBits = strlen($key) * 8;
-            return openssl_encrypt($data, 'AES-' . $numBits . '-CTR', $key, OPENSSL_RAW_DATA, $iv);
-        } elseif (extension_loaded("mcrypt")) {
-            return mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, "ctr", $iv);
-        } else {
-            throw new \RuntimeException('Extension openssl or mcrypt not loaded');
+        if (\extension_loaded('openssl')) {
+            $numBits = \strlen($key) * 8;
+            /** @noinspection PhpComposerExtensionStubsInspection */
+            return openssl_encrypt($data, 'AES-' . $numBits . '-CTR', $key, \OPENSSL_RAW_DATA, $iv);
         }
+
+        if (\extension_loaded('mcrypt')) {
+            /** @noinspection PhpComposerExtensionStubsInspection */
+            return mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, 'ctr', $iv);
+        }
+
+        throw new RuntimeException('Extension openssl or mcrypt not loaded');
     }
 
     /**
      * Decrypt AES-CTR.
      *
      * @param string $data Encrypted data
-     * @param string $key Aes key
-     * @param string $iv Aes IV
+     * @param string $key  Aes key
+     * @param string $iv   Aes IV
+     *
      * @return string Raw data
      */
     private static function decryptCtr($data, $key, $iv)
     {
-        if (extension_loaded("openssl")) {
-            $numBits = strlen($key) * 8;
-            return openssl_decrypt($data, 'AES-' . $numBits . '-CTR', $key, OPENSSL_RAW_DATA, $iv);
-        } elseif (extension_loaded("mcrypt")) {
-            return mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $data, "ctr", $iv);
-        } else {
-            throw new \RuntimeException('Extension openssl or mcrypt not loaded');
+        if (\extension_loaded('openssl')) {
+            $numBits = \strlen($key) * 8;
+            /** @noinspection PhpComposerExtensionStubsInspection */
+            return openssl_decrypt($data, 'AES-' . $numBits . '-CTR', $key, \OPENSSL_RAW_DATA, $iv);
         }
+
+        if (\extension_loaded('mcrypt')) {
+            /** @noinspection PhpComposerExtensionStubsInspection */
+            return mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $data, 'ctr', $iv);
+        }
+
+        throw new RuntimeException('Extension openssl or mcrypt not loaded');
     }
 
     /**
      * Encryption string.
      *
      * @param string $content
+     *
+     * @throws ZipException
+     *
      * @return string
      */
     public function encrypt($content)
     {
         // Init key strength.
         $password = $this->entry->getPassword();
-        assert($password !== null);
 
-        $keyStrengthBytes = 32;
-        $keyStrengthBits = $keyStrengthBytes * 8;
+        if ($password === null) {
+            throw new ZipException('No password was set for the entry "' . $this->entry->getName() . '"');
+        }
 
-        assert(self::AES_BLOCK_SIZE_BITS <= $keyStrengthBits);
+        /**
+         * WinZip 99-character limit.
+         *
+         * @see https://sourceforge.net/p/p7zip/discussion/383044/thread/c859a2f0/
+         */
+        $password = substr($password, 0, 99);
 
-        $salt = CryptoUtil::randomBytes($keyStrengthBytes / 2);
+        $keyStrengthBits = WinZipAesEntryExtraField::getKeyStrangeFromEncryptionMethod(
+            $this->entry->getEncryptionMethod()
+        );
+        $keyStrengthBytes = $keyStrengthBits / 8;
 
-        $keyParam = hash_pbkdf2("sha1", $password, $salt, self::ITERATION_COUNT, (2 * $keyStrengthBits + self::PWD_VERIFIER_BITS) / 8, true);
+        try {
+            $salt = random_bytes($keyStrengthBytes / 2);
+        } catch (\Exception $e) {
+            throw new \RuntimeException('Oops, our server is bust and cannot generate any random data.', 1, $e);
+        }
+
+        $keyParam = hash_pbkdf2(
+            'sha1',
+            $password,
+            $salt,
+            self::ITERATION_COUNT,
+            (2 * $keyStrengthBits + self::PWD_VERIFIER_BITS) / 8,
+            true
+        );
         $sha1HMacParam = substr($keyParam, $keyStrengthBytes, $keyStrengthBytes);
 
         // Can you believe they "forgot" the nonce in the CTR mode IV?! :-(
         $ctrIvSize = self::AES_BLOCK_SIZE_BITS / 8;
-        $iv = str_repeat(chr(0), $ctrIvSize);
+        $iv = str_repeat(\chr(0), $ctrIvSize);
 
         $key = substr($keyParam, 0, $keyStrengthBytes);
 
-        $content = self::aesCtrSegmentIntegerCounter(true, $content, $key, $iv);
+        $content = self::aesCtrSegmentIntegerCounter($content, $key, $iv, true);
 
         $mac = hash_hmac('sha1', $content, $sha1HMacParam, true);
 
-        return ($salt .
+        return $salt .
             substr($keyParam, 2 * $keyStrengthBytes, self::PWD_VERIFIER_BITS / 8) .
             $content .
-            substr($mac, 0, 10)
-        );
+            substr($mac, 0, 10);
     }
-}
+}

src/PhpZip/Crypto/ZipEncryptionEngine.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace PhpZip\Crypto;
+
+use PhpZip\Exception\ZipAuthenticationException;
+
+/**
+ * Encryption Engine.
+ *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+interface ZipEncryptionEngine
+{
+    /**
+     * Decryption string.
+     *
+     * @param string $encryptionContent
+     *
+     * @throws ZipAuthenticationException
+     *
+     * @return string
+     */
+    public function decrypt($encryptionContent);
+
+    /**
+     * Encryption string.
+     *
+     * @param string $content
+     *
+     * @return string
+     */
+    public function encrypt($content);
+}

src/PhpZip/Exception/Crc32Exception.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Exception;
 
 /**
@@ -6,7 +7,7 @@ namespace PhpZip\Exception;
  * Central File Header and the Data Descriptor or between the declared value
  * and the computed value from the decompressed data.
  *
- * The exception's detail message is the name of the ZIP entry.
+ * The exception detail message is the name of the ZIP entry.
  *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
@@ -31,18 +32,19 @@ class Crc32Exception extends ZipException
      * Crc32Exception constructor.
      *
      * @param string $name
-     * @param int $expected
-     * @param int $actual
+     * @param int    $expected
+     * @param int    $actual
      */
     public function __construct($name, $expected, $actual)
     {
-        parent::__construct($name
-            . " (expected CRC32 value 0x"
-            . dechex($expected)
-            . ", but is actually 0x"
-            . dechex($actual)
-            . ")");
-        assert($expected != $actual);
+        parent::__construct(
+            sprintf(
+                '%s (expected CRC32 value 0x%x, but is actually 0x%x)',
+                $name,
+                $expected,
+                $actual
+            )
+        );
         $this->expectedCrc = $expected;
         $this->actualCrc = $actual;
     }
@@ -66,5 +68,4 @@ class Crc32Exception extends ZipException
     {
         return $this->actualCrc;
     }
-
-}
+}

src/PhpZip/Exception/InvalidArgumentException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Exception;
 
 /**
@@ -8,7 +9,6 @@ namespace PhpZip\Exception;
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
  */
-class IllegalArgumentException extends ZipException
+class InvalidArgumentException extends RuntimeException
 {
-
-}
+}

src/PhpZip/Exception/RuntimeException.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace PhpZip\Exception;
+
+/**
+ * Runtime exception.
+ * Exception thrown if an error which can only be found on runtime occurs.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class RuntimeException extends \RuntimeException
+{
+}

src/PhpZip/Exception/ZipAuthenticationException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Exception;
 
 /**
@@ -9,5 +10,4 @@ namespace PhpZip\Exception;
  */
 class ZipAuthenticationException extends ZipCryptoException
 {
-
-}
+}

src/PhpZip/Exception/ZipCryptoException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Exception;
 
 /**
@@ -10,5 +11,4 @@ namespace PhpZip\Exception;
  */
 class ZipCryptoException extends ZipException
 {
-
-}
+}

src/PhpZip/Exception/ZipEntryNotFoundException.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpZip\Exception;
+
+/**
+ * Thrown if entry not found.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipEntryNotFoundException extends ZipException
+{
+    /** @var string */
+    private $entryName;
+
+    /**
+     * ZipEntryNotFoundException constructor.
+     *
+     * @param string $entryName
+     */
+    public function __construct($entryName)
+    {
+        parent::__construct(
+            sprintf(
+                'Zip Entry "%s" was not found in the archive.',
+                $entryName
+            )
+        );
+        $this->entryName = $entryName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEntryName()
+    {
+        return $this->entryName;
+    }
+}

src/PhpZip/Exception/ZipException.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Exception;
 
 /**
@@ -6,9 +7,9 @@ namespace PhpZip\Exception;
  *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
+ *
  * @see \Exception
  */
 class ZipException extends \Exception
 {
-
-}
+}

src/PhpZip/Exception/ZipNotFoundEntry.php

@@ -1,14 +0,0 @@
-<?php
-namespace PhpZip\Exception;
-
-/**
- * Thrown if entry not found.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- * @see \Exception
- */
-class ZipNotFoundEntry extends ZipException
-{
-
-}

src/PhpZip/Exception/ZipUnsupportMethod.php

@@ -1,14 +0,0 @@
-<?php
-namespace PhpZip\Exception;
-
-/**
- * Thrown if entry unsupport compression method.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- * @see \Exception
- */
-class ZipUnsupportMethod extends ZipException
-{
-
-}

src/PhpZip/Exception/ZipUnsupportMethodException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace PhpZip\Exception;
+
+/**
+ * Class ZipUnsupportMethodException.
+ */
+class ZipUnsupportMethodException extends RuntimeException
+{
+}

src/PhpZip/Extra/DefaultExtraField.php

@@ -1,98 +0,0 @@
-<?php
-namespace PhpZip\Extra;
-
-use PhpZip\Exception\ZipException;
-
-/**
- * Default implementation for an Extra Field in a Local or Central Header of a
- * ZIP file.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class DefaultExtraField extends ExtraField
-{
-    /**
-     * @var int
-     */
-    private static $headerId;
-
-    /**
-     * @var string
-     */
-    private $data;
-
-    /**
-     * Constructs a new Extra Field.
-     *
-     * @param int $headerId an unsigned short integer (two bytes) indicating the
-     *         type of the Extra Field.
-     * @throws ZipException
-     */
-    public function __construct($headerId)
-    {
-        if (0x0000 > $headerId || $headerId > 0xffff) {
-            throw new ZipException('headerId out of range');
-        }
-        self::$headerId = $headerId;
-    }
-
-    /**
-     * Returns the Header ID (type) of this Extra Field.
-     * The Header ID is an unsigned short integer (two bytes)
-     * which must be constant during the life cycle of this object.
-     *
-     * @return int
-     */
-    public static function getHeaderId()
-    {
-        return self::$headerId & 0xffff;
-    }
-
-    /**
-     * Returns the Data Size of this Extra Field.
-     * The Data Size is an unsigned short integer (two bytes)
-     * which indicates the length of the Data Block in bytes and does not
-     * include its own size in this Extra Field.
-     * This property may be initialized by calling ExtraField::readFrom.
-     *
-     * @return int The size of the Data Block in bytes
-     *         or 0 if unknown.
-     */
-    public function getDataSize()
-    {
-        return null !== $this->data ? strlen($this->data) : 0;
-    }
-
-    /**
-     * Initializes this Extra Field by deserializing a Data Block of
-     * size bytes $size from the resource $handle at the zero based offset $off.
-     *
-     * @param resource $handle
-     * @param int $off Offset bytes
-     * @param int $size Size
-     * @throws ZipException
-     */
-    public function readFrom($handle, $off, $size)
-    {
-        if (0x0000 > $size || $size > 0xffff) {
-            throw new ZipException('size out of range');
-        }
-        if ($size > 0) {
-            fseek($handle, $off, SEEK_SET);
-            $this->data = fread($handle, $size);
-        }
-    }
-
-    /**
-     * @param resource $handle
-     * @param int $off
-     */
-    public function writeTo($handle, $off)
-    {
-        if (null !== $this->data) {
-            fseek($handle, $off, SEEK_SET);
-            fwrite($handle, $this->data);
-        }
-    }
-}

src/PhpZip/Extra/ExtraField.php

@@ -1,120 +1,37 @@
 <?php
+
 namespace PhpZip\Extra;
 
-use PhpZip\Exception\ZipException;
-
 /**
- * Abstract base class for an Extra Field in a Local or Central Header of a
- * ZIP archive.
+ * Extra Field in a Local or Central Header of a ZIP archive.
  * It defines the common properties of all Extra Fields and how to
  * serialize/deserialize them to/from byte arrays.
  *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
  */
-abstract class ExtraField implements ExtraFieldHeader
+interface ExtraField
 {
-    /** The Header ID for a ZIP64 Extended Information Extra Field. */
-    const ZIP64_HEADER_ID = 0x0001;
-
     /**
-     * @var array|null
-     */
-    private static $registry;
-
-    /**
-     * A static factory method which creates a new Extra Field based on the
-     * given Header ID.
-     * The returned Extra Field still requires proper initialization, for
-     * example by calling ExtraField::readFrom.
+     * Returns the Header ID (type) of this Extra Field.
+     * The Header ID is an unsigned short integer (two bytes)
+     * which must be constant during the life cycle of this object.
      *
-     * @param int $headerId An unsigned short integer (two bytes) which indicates
-     *         the type of the returned Extra Field.
-     * @return ExtraField A new Extra Field or null if not support header id.
-     * @throws ZipException If headerId is out of range.
+     * @return int
      */
-    public static function create($headerId)
-    {
-        if (0x0000 > $headerId || $headerId > 0xffff) {
-            throw new ZipException('headerId out of range');
-        }
-
-        /**
-         * @var ExtraField $extraField
-         */
-        if (isset(self::getRegistry()[$headerId])) {
-            $extraClassName = self::getRegistry()[$headerId];
-            $extraField = new $extraClassName;
-            if ($headerId !== $extraField::getHeaderId()) {
-                throw new ZipException('Runtime error support headerId ' . $headerId);
-            }
-        } else {
-            $extraField = new DefaultExtraField($headerId);
-        }
-        return $extraField;
-    }
+    public static function getHeaderId();
 
     /**
-     * Registered extra field classes.
+     * Serializes a Data Block.
      *
-     * @return array|null
+     * @return string
      */
-    private static function getRegistry()
-    {
-        if (self::$registry === null) {
-            self::$registry[WinZipAesEntryExtraField::getHeaderId()] = '\PhpZip\Extra\WinZipAesEntryExtraField';
-            self::$registry[NtfsExtraField::getHeaderId()] = '\PhpZip\Extra\NtfsExtraField';
-        }
-        return self::$registry;
-    }
+    public function serialize();
 
     /**
-     * Returns a protective copy of the Data Block.
+     * Initializes this Extra Field by deserializing a Data Block.
      *
-     * @return resource
-     * @throws ZipException If size data block out of range.
+     * @param string $data
      */
-    public function getDataBlock()
-    {
-        $size = $this->getDataSize();
-        if (0x0000 > $size || $size > 0xffff) {
-            throw new ZipException('size data block out of range.');
-        }
-        $fp = fopen('php://temp', 'r+b');
-        if (0 === $size) return $fp;
-        $this->writeTo($fp, 0);
-        rewind($fp);
-        return $fp;
-    }
-
-    /**
-     * Returns the Data Size of this Extra Field.
-     * The Data Size is an unsigned short integer (two bytes)
-     * which indicates the length of the Data Block in bytes and does not
-     * include its own size in this Extra Field.
-     * This property may be initialized by calling ExtraField::readFrom.
-     *
-     * @return int The size of the Data Block in bytes
-     *         or 0 if unknown.
-     */
-    abstract public function getDataSize();
-
-    /**
-     * Serializes a Data Block of ExtraField::getDataSize bytes to the
-     * resource $handle at the zero based offset $off.
-     *
-     * @param resource $handle
-     * @param int $off Offset bytes
-     */
-    abstract public function writeTo($handle, $off);
-
-    /**
-     * Initializes this Extra Field by deserializing a Data Block of
-     * size bytes $size from the resource $handle at the zero based offset $off.
-     *
-     * @param resource $handle
-     * @param int $off Offset bytes
-     * @param int $size Size
-     */
-    abstract public function readFrom($handle, $off, $size);
-}
+    public function deserialize($data);
+}

src/PhpZip/Extra/ExtraFieldHeader.php

@@ -1,21 +0,0 @@
-<?php
-namespace PhpZip\Extra;
-
-/**
- * Interface ExtraFieldHeader
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-interface ExtraFieldHeader
-{
-    /**
-     * Returns the Header ID (type) of this Extra Field.
-     * The Header ID is an unsigned short integer (two bytes)
-     * which must be constant during the life cycle of this object.
-     *
-     * @return int
-     */
-    public static function getHeaderId();
-
-}

src/PhpZip/Extra/ExtraFields.php

@@ -1,213 +0,0 @@
-<?php
-namespace PhpZip\Extra;
-
-
-use PhpZip\Exception\ZipException;
-
-/**
- * Represents a collection of Extra Fields as they may
- * be present at several locations in ZIP files.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class ExtraFields
-{
-    /**
-     * The map of Extra Fields.
-     * Maps from Header ID to Extra Field.
-     * Must not be null, but may be empty if no Extra Fields are used.
-     * The map is sorted by Header IDs in ascending order.
-     *
-     * @var ExtraField[]
-     */
-    private $extra = [];
-
-    /**
-     * Returns the number of Extra Fields in this collection.
-     *
-     * @return int
-     */
-    public function size()
-    {
-        return sizeof($this->extra);
-    }
-
-    /**
-     * Returns the Extra Field with the given Header ID or null
-     * if no such Extra Field exists.
-     *
-     * @param int $headerId The requested Header ID.
-     * @return ExtraField The Extra Field with the given Header ID or
-     *         if no such Extra Field exists.
-     * @throws ZipException If headerId is out of range.
-     */
-    public function get($headerId)
-    {
-        if (0x0000 > $headerId || $headerId > 0xffff) {
-            throw new ZipException('headerId out of range');
-        }
-        if (isset($this->extra[$headerId])) {
-            return $this->extra[$headerId];
-        }
-        return null;
-    }
-
-    /**
-     * Stores the given Extra Field in this collection.
-     *
-     * @param ExtraField $extraField The Extra Field to store in this collection.
-     * @return ExtraField The Extra Field previously associated with the Header ID of
-     *                    of the given Extra Field or null if no such Extra Field existed.
-     * @throws ZipException If headerId is out of range.
-     */
-    public function add(ExtraField $extraField)
-    {
-        $headerId = $extraField::getHeaderId();
-        if (0x0000 > $headerId || $headerId > 0xffff) {
-            throw new ZipException('headerId out of range');
-        }
-        $this->extra[$headerId] = $extraField;
-        return $extraField;
-    }
-
-    /**
-     * Returns Extra Field exists
-     *
-     * @param int $headerId The requested Header ID.
-     * @return bool
-     */
-    public function has($headerId)
-    {
-        return isset($this->extra[$headerId]);
-    }
-
-    /**
-     * Removes the Extra Field with the given Header ID.
-     *
-     * @param int $headerId The requested Header ID.
-     * @return ExtraField   The Extra Field with the given Header ID or null
-     *                      if no such Extra Field exists.
-     * @throws ZipException If headerId is out of range or extra field not found.
-     */
-    public function remove($headerId)
-    {
-        if (0x0000 > $headerId || $headerId > 0xffff) {
-            throw new ZipException('headerId out of range');
-        }
-        if (isset($this->extra[$headerId])) {
-            $ef = $this->extra[$headerId];
-            unset($this->extra[$headerId]);
-            return $ef;
-        }
-        throw new ZipException('ExtraField not found');
-    }
-
-    /**
-     * Returns a protective copy of the Extra Fields.
-     * null is never returned.
-     *
-     * @return string
-     * @throws ZipException If size out of range
-     */
-    public function getExtra()
-    {
-        $size = $this->getExtraLength();
-        if (0x0000 > $size || $size > 0xffff) {
-            throw new ZipException('size out of range');
-        }
-        if (0 === $size) return '';
-
-        $fp = fopen('php://temp', 'r+b');
-        $this->writeTo($fp, 0);
-        rewind($fp);
-        $content = stream_get_contents($fp);
-        fclose($fp);
-        return $content;
-    }
-
-    /**
-     * Returns the number of bytes required to hold the Extra Fields.
-     *
-     * @return int The length of the Extra Fields in bytes. May be 0.
-     * @see #getExtra
-     */
-    public function getExtraLength()
-    {
-        if (empty($this->extra)) {
-            return 0;
-        }
-        $length = 0;
-
-        /**
-         * @var ExtraField $extraField
-         */
-        foreach ($this->extra as $extraField) {
-            $length += 4 + $extraField->getDataSize();
-        }
-        return $length;
-    }
-
-    /**
-     * Serializes a list of Extra Fields of ExtraField::getExtraLength bytes to the
-     * stream resource $handle at the zero based offset $off.
-     *
-     * @param resource $handle
-     * @param int $off Offset
-     */
-    private function writeTo($handle, $off)
-    {
-        fseek($handle, $off, SEEK_SET);
-        /**
-         * @var ExtraField $ef
-         */
-        foreach ($this->extra as $ef) {
-            fwrite($handle, pack('vv', $ef::getHeaderId(), $ef->getDataSize()));
-            $off += 4;
-            fwrite($handle, $ef->writeTo($handle, $off));
-            $off += $ef->getDataSize();
-        }
-    }
-
-    /**
-     * Initializes this Extra Field by deserializing a Data Block of
-     * size bytes $size from the resource $handle at the zero based offset $off.
-     *
-     * @param resource $handle
-     * @param int $off Offset
-     * @param int $size Size
-     * @throws ZipException If size out of range
-     */
-    public function readFrom($handle, $off, $size)
-    {
-        if (0x0000 > $size || $size > 0xffff) {
-            throw new ZipException('size out of range');
-        }
-        $map = [];
-        if (null !== $handle && 0 < $size) {
-            $end = $off + $size;
-            while ($off < $end) {
-                fseek($handle, $off, SEEK_SET);
-                $unpack = unpack('vheaderId/vdataSize', fread($handle, 4));
-                $off += 4;
-                $extraField = ExtraField::create($unpack['headerId']);
-                $extraField->readFrom($handle, $off, $unpack['dataSize']);
-                $off += $unpack['dataSize'];
-                $map[$unpack['headerId']] = $extraField;
-            }
-            assert($off === $end);
-        }
-        $this->extra = $map;
-    }
-
-    /**
-     * If clone extra fields.
-     */
-    function __clone()
-    {
-        foreach ($this->extra as $k => $v) {
-            $this->extra[$k] = clone $v;
-        }
-    }
-
-}

src/PhpZip/Extra/ExtraFieldsCollection.php

@@ -0,0 +1,282 @@
+<?php
+
+namespace PhpZip\Extra;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\ZipException;
+
+/**
+ * Represents a collection of Extra Fields as they may
+ * be present at several locations in ZIP files.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ExtraFieldsCollection implements \Countable, \ArrayAccess, \Iterator
+{
+    /**
+     * The map of Extra Fields.
+     * Maps from Header ID to Extra Field.
+     * Must not be null, but may be empty if no Extra Fields are used.
+     * The map is sorted by Header IDs in ascending order.
+     *
+     * @var ExtraField[]
+     */
+    protected $collection = [];
+
+    /**
+     * Returns the number of Extra Fields in this collection.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return \count($this->collection);
+    }
+
+    /**
+     * Returns the Extra Field with the given Header ID or null
+     * if no such Extra Field exists.
+     *
+     * @param int $headerId the requested Header ID
+     *
+     * @throws ZipException if headerId is out of range
+     *
+     * @return ExtraField|null the Extra Field with the given Header ID or
+     *                         if no such Extra Field exists
+     */
+    public function get($headerId)
+    {
+        if ($headerId < 0x0000 || $headerId > 0xffff) {
+            throw new ZipException('headerId out of range');
+        }
+
+        if (isset($this->collection[$headerId])) {
+            return $this->collection[$headerId];
+        }
+
+        return null;
+    }
+
+    /**
+     * Stores the given Extra Field in this collection.
+     *
+     * @param ExtraField $extraField the Extra Field to store in this collection
+     *
+     * @throws ZipException if headerId is out of range
+     *
+     * @return ExtraField the Extra Field previously associated with the Header ID of
+     *                    of the given Extra Field or null if no such Extra Field existed
+     */
+    public function add(ExtraField $extraField)
+    {
+        $headerId = $extraField::getHeaderId();
+
+        if ($headerId < 0x0000 || $headerId > 0xffff) {
+            throw new ZipException('headerId out of range');
+        }
+        $this->collection[$headerId] = $extraField;
+
+        return $extraField;
+    }
+
+    /**
+     * Returns Extra Field exists.
+     *
+     * @param int $headerId the requested Header ID
+     *
+     * @return bool
+     */
+    public function has($headerId)
+    {
+        return isset($this->collection[$headerId]);
+    }
+
+    /**
+     * Removes the Extra Field with the given Header ID.
+     *
+     * @param int $headerId the requested Header ID
+     *
+     * @throws ZipException if headerId is out of range or extra field not found
+     *
+     * @return ExtraField the Extra Field with the given Header ID or null
+     *                    if no such Extra Field exists
+     */
+    public function remove($headerId)
+    {
+        if ($headerId < 0x0000 || $headerId > 0xffff) {
+            throw new ZipException('headerId out of range');
+        }
+
+        if (isset($this->collection[$headerId])) {
+            $ef = $this->collection[$headerId];
+            unset($this->collection[$headerId]);
+
+            return $ef;
+        }
+
+        throw new ZipException('ExtraField not found');
+    }
+
+    /**
+     * Whether a offset exists.
+     *
+     * @see http://php.net/manual/en/arrayaccess.offsetexists.php
+     *
+     * @param mixed $offset <p>
+     *                      An offset to check for.
+     *                      </p>
+     *
+     * @return bool true on success or false on failure.
+     *              </p>
+     *              <p>
+     *              The return value will be casted to boolean if non-boolean was returned.
+     *
+     * @since 5.0.0
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->collection[$offset]);
+    }
+
+    /**
+     * Offset to retrieve.
+     *
+     * @see http://php.net/manual/en/arrayaccess.offsetget.php
+     *
+     * @param mixed $offset <p>
+     *                      The offset to retrieve.
+     *                      </p>
+     *
+     * @throws ZipException
+     *
+     * @return mixed can return all value types
+     *
+     * @since 5.0.0
+     */
+    public function offsetGet($offset)
+    {
+        return $this->get($offset);
+    }
+
+    /**
+     * Offset to set.
+     *
+     * @see http://php.net/manual/en/arrayaccess.offsetset.php
+     *
+     * @param mixed $offset <p>
+     *                      The offset to assign the value to.
+     *                      </p>
+     * @param mixed $value  <p>
+     *                      The value to set.
+     *                      </p>
+     *
+     * @throws ZipException
+     *
+     * @since 5.0.0
+     */
+    public function offsetSet($offset, $value)
+    {
+        if ($value instanceof ExtraField) {
+            if ($offset !== $value::getHeaderId()) {
+                throw new InvalidArgumentException('Value header id !== array access key');
+            }
+            $this->add($value);
+        } else {
+            throw new InvalidArgumentException('value is not instanceof ' . ExtraField::class);
+        }
+    }
+
+    /**
+     * Offset to unset.
+     *
+     * @see http://php.net/manual/en/arrayaccess.offsetunset.php
+     *
+     * @param mixed $offset <p>
+     *                      The offset to unset.
+     *                      </p>
+     *
+     * @since 5.0.0
+     *
+     * @throws ZipException
+     */
+    public function offsetUnset($offset)
+    {
+        $this->remove($offset);
+    }
+
+    /**
+     * Return the current element.
+     *
+     * @see http://php.net/manual/en/iterator.current.php
+     *
+     * @return mixed can return any type
+     *
+     * @since 5.0.0
+     */
+    public function current()
+    {
+        return current($this->collection);
+    }
+
+    /**
+     * Move forward to next element.
+     *
+     * @see http://php.net/manual/en/iterator.next.php
+     * @since 5.0.0
+     */
+    public function next()
+    {
+        next($this->collection);
+    }
+
+    /**
+     * Return the key of the current element.
+     *
+     * @see http://php.net/manual/en/iterator.key.php
+     *
+     * @return mixed scalar on success, or null on failure
+     *
+     * @since 5.0.0
+     */
+    public function key()
+    {
+        return key($this->collection);
+    }
+
+    /**
+     * Checks if current position is valid.
+     *
+     * @see http://php.net/manual/en/iterator.valid.php
+     *
+     * @return bool The return value will be casted to boolean and then evaluated.
+     *              Returns true on success or false on failure.
+     *
+     * @since 5.0.0
+     */
+    public function valid()
+    {
+        return $this->offsetExists($this->key());
+    }
+
+    /**
+     * Rewind the Iterator to the first element.
+     *
+     * @see http://php.net/manual/en/iterator.rewind.php
+     * @since 5.0.0
+     */
+    public function rewind()
+    {
+        reset($this->collection);
+    }
+
+    /**
+     * If clone extra fields.
+     */
+    public function __clone()
+    {
+        foreach ($this->collection as $k => $v) {
+            $this->collection[$k] = clone $v;
+        }
+    }
+}

src/PhpZip/Extra/ExtraFieldsFactory.php

@@ -0,0 +1,202 @@
+<?php
+
+namespace PhpZip\Extra;
+
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\Fields\ApkAlignmentExtraField;
+use PhpZip\Extra\Fields\DefaultExtraField;
+use PhpZip\Extra\Fields\JarMarkerExtraField;
+use PhpZip\Extra\Fields\NtfsExtraField;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
+use PhpZip\Extra\Fields\Zip64ExtraField;
+use PhpZip\Model\ZipEntry;
+use PhpZip\Util\StringUtil;
+
+/**
+ * Extra Fields Factory.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ExtraFieldsFactory
+{
+    /** @var array|null */
+    protected static $registry;
+
+    private function __construct()
+    {
+    }
+
+    /**
+     * @param string        $extra
+     * @param ZipEntry|null $entry
+     *
+     * @throws ZipException
+     *
+     * @return ExtraFieldsCollection
+     */
+    public static function createExtraFieldCollections($extra, ZipEntry $entry = null)
+    {
+        $extraFieldsCollection = new ExtraFieldsCollection();
+
+        if ($extra !== null) {
+            $extraLength = \strlen($extra);
+
+            if ($extraLength > 0xffff) {
+                throw new ZipException('Extra Fields too large: ' . $extraLength);
+            }
+            $pos = 0;
+            $endPos = $extraLength;
+
+            while ($endPos - $pos >= 4) {
+                $unpack = unpack('vheaderId/vdataSize', substr($extra, $pos, 4));
+                $pos += 4;
+                $headerId = (int) $unpack['headerId'];
+                $dataSize = (int) $unpack['dataSize'];
+                $extraField = self::create($headerId);
+
+                if ($extraField instanceof Zip64ExtraField && $entry !== null) {
+                    $extraField->setEntry($entry);
+                }
+
+                if ($dataSize > 0) {
+                    $content = substr($extra, $pos, $dataSize);
+
+                    if ($content !== false) {
+                        $extraField->deserialize($content);
+                        $extraFieldsCollection[$headerId] = $extraField;
+                    }
+                }
+
+                $pos += $dataSize;
+            }
+        }
+
+        return $extraFieldsCollection;
+    }
+
+    /**
+     * @param ExtraFieldsCollection $extraFieldsCollection
+     *
+     * @throws ZipException
+     *
+     * @return string
+     */
+    public static function createSerializedData(ExtraFieldsCollection $extraFieldsCollection)
+    {
+        $extraData = '';
+
+        foreach ($extraFieldsCollection as $extraField) {
+            $data = $extraField->serialize();
+            $extraData .= pack('vv', $extraField::getHeaderId(), \strlen($data));
+            $extraData .= $data;
+        }
+
+        $size = \strlen($extraData);
+
+        if ($size < 0x0000 || $size > 0xffff) {
+            throw new ZipException('Size extra out of range: ' . $size . '. Extra data: ' . $extraData);
+        }
+
+        return $extraData;
+    }
+
+    /**
+     * A static factory method which creates a new Extra Field based on the
+     * given Header ID.
+     * The returned Extra Field still requires proper initialization, for
+     * example by calling ExtraField::readFrom.
+     *
+     * @param int $headerId an unsigned short integer (two bytes) which indicates
+     *                      the type of the returned Extra Field
+     *
+     * @throws ZipException if headerId is out of range
+     *
+     * @return ExtraField a new Extra Field or null if not support header id
+     */
+    public static function create($headerId)
+    {
+        if ($headerId < 0x0000 || $headerId > 0xffff) {
+            throw new ZipException('headerId out of range');
+        }
+
+        if (isset(self::getRegistry()[$headerId])) {
+            $extraClassName = self::getRegistry()[$headerId];
+            /** @var ExtraField $extraField */
+            $extraField = new $extraClassName();
+
+            if ($headerId !== $extraField::getHeaderId()) {
+                throw new ZipException('Runtime error support headerId ' . $headerId);
+            }
+        } else {
+            $extraField = new DefaultExtraField($headerId);
+        }
+
+        return $extraField;
+    }
+
+    /**
+     * Registered extra field classes.
+     *
+     * @return array
+     */
+    protected static function getRegistry()
+    {
+        if (self::$registry === null) {
+            self::$registry[WinZipAesEntryExtraField::getHeaderId()] = WinZipAesEntryExtraField::class;
+            self::$registry[NtfsExtraField::getHeaderId()] = NtfsExtraField::class;
+            self::$registry[Zip64ExtraField::getHeaderId()] = Zip64ExtraField::class;
+            self::$registry[ApkAlignmentExtraField::getHeaderId()] = ApkAlignmentExtraField::class;
+            self::$registry[JarMarkerExtraField::getHeaderId()] = JarMarkerExtraField::class;
+        }
+
+        return self::$registry;
+    }
+
+    /**
+     * @return WinZipAesEntryExtraField
+     */
+    public static function createWinZipAesEntryExtra()
+    {
+        return new WinZipAesEntryExtraField();
+    }
+
+    /**
+     * @return NtfsExtraField
+     */
+    public static function createNtfsExtra()
+    {
+        return new NtfsExtraField();
+    }
+
+    /**
+     * @param ZipEntry $entry
+     *
+     * @return Zip64ExtraField
+     */
+    public static function createZip64Extra(ZipEntry $entry)
+    {
+        return new Zip64ExtraField($entry);
+    }
+
+    /**
+     * @param ZipEntry $entry
+     * @param int      $padding
+     *
+     * @return ApkAlignmentExtraField
+     */
+    public static function createApkAlignExtra(ZipEntry $entry, $padding)
+    {
+        $padding = (int) $padding;
+        $multiple = 4;
+
+        if (StringUtil::endsWith($entry->getName(), '.so')) {
+            $multiple = ApkAlignmentExtraField::ANDROID_COMMON_PAGE_ALIGNMENT_BYTES;
+        }
+        $extraField = new ApkAlignmentExtraField();
+        $extraField->setMultiple($multiple);
+        $extraField->setPadding($padding);
+
+        return $extraField;
+    }
+}

src/PhpZip/Extra/Fields/ApkAlignmentExtraField.php

@@ -0,0 +1,115 @@
+<?php
+
+namespace PhpZip\Extra\Fields;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Extra\ExtraField;
+
+/**
+ * Apk Alignment Extra Field.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ApkAlignmentExtraField implements ExtraField
+{
+    /**
+     * Minimum size (in bytes) of the extensible data block/field used
+     * for alignment of uncompressed entries.
+     */
+    const ALIGNMENT_ZIP_EXTRA_MIN_SIZE_BYTES = 6;
+
+    const ANDROID_COMMON_PAGE_ALIGNMENT_BYTES = 4096;
+
+    /** @var int */
+    private $multiple;
+
+    /** @var int */
+    private $padding;
+
+    /**
+     * Returns the Header ID (type) of this Extra Field.
+     * The Header ID is an unsigned short integer (two bytes)
+     * which must be constant during the life cycle of this object.
+     *
+     * @return int
+     */
+    public static function getHeaderId()
+    {
+        return 0xD935;
+    }
+
+    /**
+     * Serializes a Data Block.
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        if ($this->padding > 0) {
+            $args = array_merge(
+                ['vc*', $this->multiple],
+                array_fill(2, $this->padding, 0)
+            );
+
+            return \call_user_func_array('pack', $args);
+        }
+
+        return pack('v', $this->multiple);
+    }
+
+    /**
+     * Initializes this Extra Field by deserializing a Data Block.
+     *
+     * @param string $data
+     */
+    public function deserialize($data)
+    {
+        $length = \strlen($data);
+
+        if ($length < 2) {
+            // This is APK alignment field.
+            // FORMAT:
+            //  * uint16 alignment multiple (in bytes)
+            //  * remaining bytes -- padding to achieve alignment of data which starts after
+            //    the extra field
+            throw new InvalidArgumentException(
+                'Minimum 6 bytes of the extensible data block/field used for alignment of uncompressed entries.'
+            );
+        }
+        $this->multiple = unpack('v', $data)[1];
+        $this->padding = $length - 2;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getMultiple()
+    {
+        return $this->multiple;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPadding()
+    {
+        return $this->padding;
+    }
+
+    /**
+     * @param int $multiple
+     */
+    public function setMultiple($multiple)
+    {
+        $this->multiple = $multiple;
+    }
+
+    /**
+     * @param int $padding
+     */
+    public function setPadding($padding)
+    {
+        $this->padding = $padding;
+    }
+}

src/PhpZip/Extra/Fields/DefaultExtraField.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace PhpZip\Extra\Fields;
+
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\ExtraField;
+
+/**
+ * Default implementation for an Extra Field in a Local or Central Header of a
+ * ZIP file.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class DefaultExtraField implements ExtraField
+{
+    /** @var int */
+    private static $headerId;
+
+    /** @var string */
+    protected $data;
+
+    /**
+     * Constructs a new Extra Field.
+     *
+     * @param int $headerId an unsigned short integer (two bytes) indicating the
+     *                      type of the Extra Field
+     *
+     * @throws ZipException
+     */
+    public function __construct($headerId)
+    {
+        if ($headerId < 0x0000 || $headerId > 0xffff) {
+            throw new ZipException('headerId out of range');
+        }
+        self::$headerId = $headerId;
+    }
+
+    /**
+     * Returns the Header ID (type) of this Extra Field.
+     * The Header ID is an unsigned short integer (two bytes)
+     * which must be constant during the life cycle of this object.
+     *
+     * @return int
+     */
+    public static function getHeaderId()
+    {
+        return self::$headerId & 0xffff;
+    }
+
+    /**
+     * Serializes a Data Block.
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Initializes this Extra Field by deserializing a Data Block.
+     *
+     * @param string $data
+     */
+    public function deserialize($data)
+    {
+        $this->data = $data;
+    }
+}

src/PhpZip/Extra/Fields/JarMarkerExtraField.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace PhpZip\Extra\Fields;
+
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\ExtraField;
+
+/**
+ * Jar Marker Extra Field
+ * An executable Java program can be packaged in a JAR file with all the libraries it uses.
+ * Executable JAR files can easily be distinguished from the files packed in the JAR file
+ * by the extra field in the first file, which is hexadecimal in the 0xCAFE bytes series.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class JarMarkerExtraField implements ExtraField
+{
+    /**
+     * Returns the Header ID (type) of this Extra Field.
+     * The Header ID is an unsigned short integer (two bytes)
+     * which must be constant during the life cycle of this object.
+     *
+     * @return int
+     */
+    public static function getHeaderId()
+    {
+        return 0xCAFE;
+    }
+
+    /**
+     * Serializes a Data Block.
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        return '';
+    }
+
+    /**
+     * Initializes this Extra Field by deserializing a Data Block.
+     *
+     * @param string $data
+     *
+     * @throws ZipException
+     */
+    public function deserialize($data)
+    {
+        if ($data !== '') {
+            throw new ZipException("JarMarker doesn't expect any data");
+        }
+    }
+}

src/PhpZip/Extra/Fields/NtfsExtraField.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace PhpZip\Extra\Fields;
+
+use PhpZip\Extra\ExtraField;
+use PhpZip\Util\PackUtil;
+
+/**
+ * NTFS Extra Field.
+ *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class NtfsExtraField implements ExtraField
+{
+    /**
+     * Modify time.
+     *
+     * @var int Unix Timestamp
+     */
+    private $mtime;
+
+    /**
+     * Access Time.
+     *
+     * @var int Unix Timestamp
+     */
+    private $atime;
+
+    /**
+     * Create Time.
+     *
+     * @var int Unix Time
+     */
+    private $ctime;
+
+    /**
+     * Returns the Header ID (type) of this Extra Field.
+     * The Header ID is an unsigned short integer (two bytes)
+     * which must be constant during the life cycle of this object.
+     *
+     * @return int
+     */
+    public static function getHeaderId()
+    {
+        return 0x000a;
+    }
+
+    /**
+     * Initializes this Extra Field by deserializing a Data Block.
+     *
+     * @param string $data
+     */
+    public function deserialize($data)
+    {
+        $unpack = unpack('vtag/vsizeAttr', substr($data, 0, 4));
+
+        if ($unpack['sizeAttr'] === 24) {
+            $tagData = substr($data, 4, $unpack['sizeAttr']);
+            $this->mtime = PackUtil::unpackLongLE(substr($tagData, 0, 8)) / 10000000 - 11644473600;
+            $this->atime = PackUtil::unpackLongLE(substr($tagData, 8, 8)) / 10000000 - 11644473600;
+            $this->ctime = PackUtil::unpackLongLE(substr($tagData, 16, 8)) / 10000000 - 11644473600;
+        }
+    }
+
+    /**
+     * Serializes a Data Block.
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        $serialize = '';
+
+        if ($this->mtime !== null && $this->atime !== null && $this->ctime !== null) {
+            $mtimeLong = ($this->mtime + 11644473600) * 10000000;
+            $atimeLong = ($this->atime + 11644473600) * 10000000;
+            $ctimeLong = ($this->ctime + 11644473600) * 10000000;
+
+            $serialize .= pack('Vvv', 0, 1, 8 * 3)
+                . PackUtil::packLongLE($mtimeLong)
+                . PackUtil::packLongLE($atimeLong)
+                . PackUtil::packLongLE($ctimeLong);
+        }
+
+        return $serialize;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMtime()
+    {
+        return $this->mtime;
+    }
+
+    /**
+     * @param int $mtime
+     */
+    public function setMtime($mtime)
+    {
+        $this->mtime = (int) $mtime;
+    }
+
+    /**
+     * @return int
+     */
+    public function getAtime()
+    {
+        return $this->atime;
+    }
+
+    /**
+     * @param int $atime
+     */
+    public function setAtime($atime)
+    {
+        $this->atime = (int) $atime;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCtime()
+    {
+        return $this->ctime;
+    }
+
+    /**
+     * @param int $ctime
+     */
+    public function setCtime($ctime)
+    {
+        $this->ctime = (int) $ctime;
+    }
+}

src/PhpZip/Extra/Fields/WinZipAesEntryExtraField.php

@@ -1,41 +1,57 @@
 <?php
-namespace PhpZip\Extra;
+
+namespace PhpZip\Extra\Fields;
 
 use PhpZip\Exception\ZipException;
+use PhpZip\Extra\ExtraField;
+use PhpZip\ZipFile;
 
 /**
  * WinZip AES Extra Field.
  *
- * @see http://www.winzip.com/win/en/aes_info.htm AES Encryption Information: Encryption Specification AE-1 and AE-2 (WinZip Computing, S.L.)
+ * @see http://www.winzip.com/win/en/aes_info.htm AES Encryption Information: Encryption Specification AE-1 and AE-2
+ *     (WinZip Computing, S.L.)
  * @see http://www.winzip.com/win/en/aes_tips.htm AES Coding Tips for Developers (WinZip Computing, S.L.)
+ *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
  */
-class WinZipAesEntryExtraField extends ExtraField
+class WinZipAesEntryExtraField implements ExtraField
 {
     const DATA_SIZE = 7;
+
     const VENDOR_ID = 17729; // 'A' | ('E' << 8);
 
     /**
      * Entries of this type <em>do</em> include the standard ZIP CRC-32 value.
-     * For use with @see WinZipAesEntryExtraField::setVendorVersion()}/@see WinZipAesEntryExtraField::getVendorVersion().
+     * For use with @see WinZipAesEntryExtraField::setVendorVersion()}/@see
+     * WinZipAesEntryExtraField::getVendorVersion().
      */
     const VV_AE_1 = 1;
 
     /**
      * Entries of this type do <em>not</em> include the standard ZIP CRC-32 value.
-     * For use with @see WinZipAesEntryExtraField::setVendorVersion()}/@see WinZipAesEntryExtraField::getVendorVersion().
+     * For use with @see WinZipAesEntryExtraField::setVendorVersion()}/@see
+     * WinZipAesEntryExtraField::getVendorVersion().
      */
     const VV_AE_2 = 2;
 
     const KEY_STRENGTH_128BIT = 128;
+
     const KEY_STRENGTH_192BIT = 192;
+
     const KEY_STRENGTH_256BIT = 256;
 
-    private static $keyStrengths = [
+    protected static $keyStrengths = [
         self::KEY_STRENGTH_128BIT => 0x01,
         self::KEY_STRENGTH_192BIT => 0x02,
-        self::KEY_STRENGTH_256BIT => 0x03
+        self::KEY_STRENGTH_256BIT => 0x03,
+    ];
+
+    protected static $encryptionMethods = [
+        self::KEY_STRENGTH_128BIT => ZipFile::ENCRYPTION_METHOD_WINZIP_AES_128,
+        self::KEY_STRENGTH_192BIT => ZipFile::ENCRYPTION_METHOD_WINZIP_AES_192,
+        self::KEY_STRENGTH_256BIT => ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256,
     ];
 
     /**
@@ -43,21 +59,21 @@ class WinZipAesEntryExtraField extends ExtraField
      *
      * @var int
      */
-    private $vendorVersion = self::VV_AE_1;
+    protected $vendorVersion = self::VV_AE_1;
 
     /**
      * Encryption strength.
      *
      * @var int
      */
-    private $encryptionStrength = self::KEY_STRENGTH_256BIT;
+    protected $encryptionStrength = self::KEY_STRENGTH_256BIT;
 
     /**
      * Zip compression method.
      *
      * @var int
      */
-    private $method;
+    protected $method;
 
     /**
      * Returns the Header ID (type) of this Extra Field.
@@ -71,21 +87,6 @@ class WinZipAesEntryExtraField extends ExtraField
         return 0x9901;
     }
 
-    /**
-     * Returns the Data Size of this Extra Field.
-     * The Data Size is an unsigned short integer (two bytes)
-     * which indicates the length of the Data Block in bytes and does not
-     * include its own size in this Extra Field.
-     * This property may be initialized by calling ExtraField::readFrom.
-     *
-     * @return int The size of the Data Block in bytes
-     *         or 0 if unknown.
-     */
-    public function getDataSize()
-    {
-        return self::DATA_SIZE;
-    }
-
     /**
      * Returns the vendor version.
      *
@@ -100,14 +101,16 @@ class WinZipAesEntryExtraField extends ExtraField
     /**
      * Sets the vendor version.
      *
+     * @param int $vendorVersion the vendor version
+     *
+     * @throws ZipException unsupport vendor version
+     *
      * @see    WinZipAesEntryExtraField::VV_AE_1
      * @see    WinZipAesEntryExtraField::VV_AE_2
-     * @param  int $vendorVersion the vendor version.
-     * @throws ZipException Unsupport vendor version.
      */
     public function setVendorVersion($vendorVersion)
     {
-        if ($vendorVersion < self::VV_AE_1 || self::VV_AE_2 < $vendorVersion) {
+        if ($vendorVersion < self::VV_AE_1 || $vendorVersion > self::VV_AE_2) {
             throw new ZipException($vendorVersion);
         }
         $this->vendorVersion = $vendorVersion;
@@ -124,6 +127,8 @@ class WinZipAesEntryExtraField extends ExtraField
     }
 
     /**
+     * @throws ZipException
+     *
      * @return bool|int
      */
     public function getKeyStrength()
@@ -132,16 +137,20 @@ class WinZipAesEntryExtraField extends ExtraField
     }
 
     /**
-     * @param int $encryptionStrength Encryption strength as bits.
+     * @param int $encryptionStrength encryption strength as bits
+     *
+     * @throws ZipException if unsupport encryption strength
+     *
      * @return int
-     * @throws ZipException If unsupport encryption strength.
      */
     public static function keyStrength($encryptionStrength)
     {
         $flipKeyStrength = array_flip(self::$keyStrengths);
+
         if (!isset($flipKeyStrength[$encryptionStrength])) {
-            throw new ZipException("Unsupport encryption strength " . $encryptionStrength);
+            throw new ZipException('Unsupport encryption strength ' . $encryptionStrength);
         }
+
         return $flipKeyStrength[$encryptionStrength];
     }
 
@@ -156,48 +165,50 @@ class WinZipAesEntryExtraField extends ExtraField
     }
 
     /**
-     * Sets compression method.
+     * Internal encryption method.
      *
-     * @param int $compressionMethod Compression method
-     * @throws ZipException Compression method out of range.
+     * @throws ZipException
+     *
+     * @return int
      */
-    public function setMethod($compressionMethod)
+    public function getEncryptionMethod()
     {
-        if (0x0000 > $compressionMethod || $compressionMethod > 0xffff) {
-            throw new ZipException('Compression method out of range');
-        }
-        $this->method = $compressionMethod;
+        return isset(self::$encryptionMethods[$this->getKeyStrength()]) ?
+            self::$encryptionMethods[$this->getKeyStrength()] :
+            self::$encryptionMethods[self::KEY_STRENGTH_256BIT];
     }
 
     /**
-     * Initializes this Extra Field by deserializing a Data Block of
-     * size bytes $size from the resource $handle at the zero based offset $off.
+     * @param int $encryptionMethod
      *
-     * @param resource $handle
-     * @param int $off Offset bytes
-     * @param int $size Size
      * @throws ZipException
+     *
+     * @return int
      */
-    public function readFrom($handle, $off, $size)
+    public static function getKeyStrangeFromEncryptionMethod($encryptionMethod)
     {
-        if (self::DATA_SIZE != $size)
-            throw new ZipException();
+        $flipKey = array_flip(self::$encryptionMethods);
 
-        fseek($handle, $off, SEEK_SET);
-        /**
-         * @var int $vendorVersion
-         * @var int $vendorId
-         * @var int $keyStrength
-         * @var int $method
-         */
-        $unpack = unpack('vvendorVersion/vvendorId/ckeyStrength/vmethod', fread($handle, 7));
-        extract($unpack);
-        $this->setVendorVersion($vendorVersion);
-        if (self::VENDOR_ID != $vendorId) {
-            throw new ZipException();
+        if (!isset($flipKey[$encryptionMethod])) {
+            throw new ZipException('Unsupport encryption method ' . $encryptionMethod);
         }
-        $this->setKeyStrength(self::keyStrength($keyStrength)); // checked
-        $this->setMethod($method);
+
+        return $flipKey[$encryptionMethod];
+    }
+
+    /**
+     * Sets compression method.
+     *
+     * @param int $compressionMethod Compression method
+     *
+     * @throws ZipException compression method out of range
+     */
+    public function setMethod($compressionMethod)
+    {
+        if ($compressionMethod < 0x0000 || $compressionMethod > 0xffff) {
+            throw new ZipException('Compression method out of range');
+        }
+        $this->method = $compressionMethod;
     }
 
     /**
@@ -213,24 +224,61 @@ class WinZipAesEntryExtraField extends ExtraField
     /**
      * Returns encryption strength.
      *
-     * @param int $keyStrength Key strength in bits.
+     * @param int $keyStrength key strength in bits
+     *
      * @return int
      */
     public static function encryptionStrength($keyStrength)
     {
-        return isset(self::$keyStrengths[$keyStrength]) ? self::$keyStrengths[$keyStrength] : self::$keyStrengths[self::KEY_STRENGTH_128BIT];
+        return isset(self::$keyStrengths[$keyStrength]) ?
+            self::$keyStrengths[$keyStrength] :
+            self::$keyStrengths[self::KEY_STRENGTH_128BIT];
     }
 
     /**
-     * Serializes a Data Block of ExtraField::getDataSize bytes to the
-     * resource $handle at the zero based offset $off.
+     * Serializes a Data Block.
      *
-     * @param resource $handle
-     * @param int $off Offset bytes
+     * @return string
      */
-    public function writeTo($handle, $off)
+    public function serialize()
     {
-        fseek($handle, $off, SEEK_SET);
-        fwrite($handle, pack('vvcv', $this->vendorVersion, self::VENDOR_ID, $this->encryptionStrength, $this->method));
+        return pack(
+            'vvcv',
+            $this->vendorVersion,
+            self::VENDOR_ID,
+            $this->encryptionStrength,
+            $this->method
+        );
     }
-}
+
+    /**
+     * Initializes this Extra Field by deserializing a Data Block.
+     *
+     * @param string $data
+     *
+     * @throws ZipException
+     */
+    public function deserialize($data)
+    {
+        $size = \strlen($data);
+
+        if ($size !== self::DATA_SIZE) {
+            throw new ZipException('WinZip AES Extra data invalid size: ' . $size . '. Must be ' . self::DATA_SIZE);
+        }
+
+        /**
+         * @var int $vendorVersion
+         * @var int $vendorId
+         * @var int $keyStrength
+         * @var int $method
+         */
+        $unpack = unpack('vvendorVersion/vvendorId/ckeyStrength/vmethod', $data);
+        $this->setVendorVersion($unpack['vendorVersion']);
+
+        if ($unpack['vendorId'] !== self::VENDOR_ID) {
+            throw new ZipException('Vendor id invalid: ' . $unpack['vendorId'] . '. Must be ' . self::VENDOR_ID);
+        }
+        $this->setKeyStrength(self::keyStrength($unpack['keyStrength'])); // checked
+        $this->setMethod($unpack['method']);
+    }
+}

src/PhpZip/Extra/Fields/Zip64ExtraField.php

@@ -0,0 +1,123 @@
+<?php
+
+namespace PhpZip\Extra\Fields;
+
+use PhpZip\Exception\RuntimeException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\ExtraField;
+use PhpZip\Model\ZipEntry;
+use PhpZip\Util\PackUtil;
+
+/**
+ * ZIP64 Extra Field.
+ *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class Zip64ExtraField implements ExtraField
+{
+    /** The Header ID for a ZIP64 Extended Information Extra Field. */
+    const ZIP64_HEADER_ID = 0x0001;
+
+    /** @var ZipEntry */
+    protected $entry;
+
+    /**
+     * Zip64ExtraField constructor.
+     *
+     * @param ZipEntry $entry
+     */
+    public function __construct(ZipEntry $entry = null)
+    {
+        if ($entry !== null) {
+            $this->setEntry($entry);
+        }
+    }
+
+    /**
+     * @param ZipEntry $entry
+     */
+    public function setEntry(ZipEntry $entry)
+    {
+        $this->entry = $entry;
+    }
+
+    /**
+     * Returns the Header ID (type) of this Extra Field.
+     * The Header ID is an unsigned short integer (two bytes)
+     * which must be constant during the life cycle of this object.
+     *
+     * @return int
+     */
+    public static function getHeaderId()
+    {
+        return 0x0001;
+    }
+
+    /**
+     * Serializes a Data Block.
+     *
+     * @return string
+     */
+    public function serialize()
+    {
+        if ($this->entry === null) {
+            throw new RuntimeException('entry is null');
+        }
+        $data = '';
+        // Write out Uncompressed Size.
+        $size = $this->entry->getSize();
+
+        if ($size >= 0xffffffff) {
+            $data .= PackUtil::packLongLE($size);
+        }
+        // Write out Compressed Size.
+        $compressedSize = $this->entry->getCompressedSize();
+
+        if ($compressedSize >= 0xffffffff) {
+            $data .= PackUtil::packLongLE($compressedSize);
+        }
+        // Write out Relative Header Offset.
+        $offset = $this->entry->getOffset();
+
+        if ($offset >= 0xffffffff) {
+            $data .= PackUtil::packLongLE($offset);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Initializes this Extra Field by deserializing a Data Block.
+     *
+     * @param string $data
+     *
+     * @throws ZipException
+     */
+    public function deserialize($data)
+    {
+        if ($this->entry === null) {
+            throw new RuntimeException('entry is null');
+        }
+        $off = 0;
+
+        // Read in Uncompressed Size.
+        if ($this->entry->getSize() === 0xffffffff) {
+            $this->entry->setSize(PackUtil::unpackLongLE(substr($data, $off, 8)));
+            $off += 8;
+        }
+
+        // Read in Compressed Size.
+        if ($this->entry->getCompressedSize() === 0xffffffff) {
+            $this->entry->setCompressedSize(PackUtil::unpackLongLE(substr($data, $off, 8)));
+            $off += 8;
+        }
+
+        // Read in Relative Header Offset.
+        if ($this->entry->getOffset() === 0xffffffff) {
+            $this->entry->setOffset(PackUtil::unpackLongLE(substr($data, $off, 8)));
+        }
+    }
+}

src/PhpZip/Extra/NtfsExtraField.php

@@ -1,176 +0,0 @@
-<?php
-namespace PhpZip\Extra;
-
-use PhpZip\Exception\ZipException;
-use PhpZip\Util\PackUtil;
-
-/**
- * NTFS Extra Field
- *
- * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class NtfsExtraField extends ExtraField
-{
-
-    /**
-     * Modify time
-     *
-     * @var int Unix Timestamp
-     */
-    private $mtime;
-
-    /**
-     * Access Time
-     *
-     * @var int Unix Timestamp
-     */
-    private $atime;
-
-    /**
-     * Create Time
-     *
-     * @var int Unix Time
-     */
-    private $ctime;
-
-    /**
-     * @var string
-     */
-    private $rawData = "";
-
-    /**
-     * Returns the Header ID (type) of this Extra Field.
-     * The Header ID is an unsigned short integer (two bytes)
-     * which must be constant during the life cycle of this object.
-     *
-     * @return int
-     */
-    public static function getHeaderId()
-    {
-        return 0x000a;
-    }
-
-    /**
-     * Returns the Data Size of this Extra Field.
-     * The Data Size is an unsigned short integer (two bytes)
-     * which indicates the length of the Data Block in bytes and does not
-     * include its own size in this Extra Field.
-     * This property may be initialized by calling ExtraField::readFrom.
-     *
-     * @return int The size of the Data Block in bytes
-     *         or 0 if unknown.
-     */
-    public function getDataSize()
-    {
-        return 8 * 4 + strlen($this->rawData);
-    }
-
-    /**
-     * Initializes this Extra Field by deserializing a Data Block of
-     * size bytes $size from the resource $handle at the zero based offset $off.
-     *
-     * @param resource $handle
-     * @param int $off Offset bytes
-     * @param int $size Size
-     * @throws ZipException If size out of range
-     */
-    public function readFrom($handle, $off, $size)
-    {
-        if (0x0000 > $size || $size > 0xffff) {
-            throw new ZipException('size out of range');
-        }
-        if ($size > 0) {
-            $off += 4;
-            fseek($handle, $off, SEEK_SET);
-
-            $unpack = unpack('vtag/vsizeAttr', fread($handle, 4));
-            if ($unpack['sizeAttr'] === 24) {
-                $tagData = fread($handle, $unpack['sizeAttr']);
-
-                $this->mtime = PackUtil::unpackLongLE(substr($tagData, 0, 8)) / 10000000 - 11644473600;
-                $this->atime = PackUtil::unpackLongLE(substr($tagData, 8, 8)) / 10000000 - 11644473600;
-                $this->ctime = PackUtil::unpackLongLE(substr($tagData, 16, 8)) / 10000000 - 11644473600;
-            }
-            $off += $unpack['sizeAttr'];
-
-            if ($size > $off) {
-                $this->rawData .= fread($handle, $size - $off);
-            }
-        }
-    }
-
-    /**
-     * Serializes a Data Block of ExtraField::getDataSize bytes to the
-     * resource $handle at the zero based offset $off.
-     *
-     * @param resource $handle
-     * @param int $off Offset bytes
-     */
-    public function writeTo($handle, $off)
-    {
-        if ($this->mtime !== null && $this->atime !== null && $this->ctime !== null) {
-            fseek($handle, $off, SEEK_SET);
-            fwrite($handle, pack('Vvv', 0, 1, 8 * 3 + strlen($this->rawData)));
-            $mtimeLong = ($this->mtime + 11644473600) * 10000000;
-            fwrite($handle, PackUtil::packLongLE($mtimeLong));
-            $atimeLong = ($this->atime + 11644473600) * 10000000;
-            fwrite($handle, PackUtil::packLongLE($atimeLong));
-            $ctimeLong = ($this->ctime + 11644473600) * 10000000;
-            fwrite($handle, PackUtil::packLongLE($ctimeLong));
-            if (!empty($this->rawData)) {
-                fwrite($handle, $this->rawData);
-            }
-        }
-    }
-
-    /**
-     * @return int
-     */
-    public function getMtime()
-    {
-        return $this->mtime;
-    }
-
-    /**
-     * @param int $mtime
-     */
-    public function setMtime($mtime)
-    {
-        $this->mtime = (int)$mtime;
-    }
-
-    /**
-     * @return int
-     */
-    public function getAtime()
-    {
-        return $this->atime;
-    }
-
-    /**
-     * @param int $atime
-     */
-    public function setAtime($atime)
-    {
-        $this->atime = (int)$atime;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCtime()
-    {
-        return $this->ctime;
-    }
-
-    /**
-     * @param int $ctime
-     */
-    public function setCtime($ctime)
-    {
-        $this->ctime = (int)$ctime;
-    }
-
-}

src/PhpZip/Mapper/OffsetPositionMapper.php

@@ -1,42 +0,0 @@
-<?php
-namespace PhpZip\Mapper;
-
-/**
- * Adds a offset value to the given position.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class OffsetPositionMapper extends PositionMapper
-{
-    /**
-     * @var int
-     */
-    private $offset;
-
-    /**
-     * @param int $offset
-     */
-    public function __construct($offset)
-    {
-        $this->offset = $offset;
-    }
-
-    /**
-     * @param int $position
-     * @return int
-     */
-    public function map($position)
-    {
-        return parent::map($position) + $this->offset;
-    }
-
-    /**
-     * @param int $position
-     * @return int
-     */
-    public function unmap($position)
-    {
-        return parent::unmap($position) - $this->offset;
-    }
-}

src/PhpZip/Mapper/PositionMapper.php

@@ -1,29 +0,0 @@
-<?php
-namespace PhpZip\Mapper;
-
-/**
- * Maps a given position.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class PositionMapper
-{
-    /**
-     * @param int $position
-     * @return int
-     */
-    public function map($position)
-    {
-        return $position;
-    }
-
-    /**
-     * @param int $position
-     * @return int
-     */
-    public function unmap($position)
-    {
-        return $position;
-    }
-}

src/PhpZip/Model/EndOfCentralDirectory.php

@@ -1,48 +1,23 @@
 <?php
-namespace PhpZip;
+
+namespace PhpZip\Model;
 
 /**
- * Constants for ZIP files.
+ * End of Central Directory.
  *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
  */
-interface ZipConstants
+class EndOfCentralDirectory
 {
-    /** Local File Header signature. */
-    const LOCAL_FILE_HEADER_SIG = 0x04034B50;
-
-    /** Data Descriptor signature. */
-    const DATA_DESCRIPTOR_SIG = 0x08074B50;
-
-    /** Central File Header signature. */
-    const CENTRAL_FILE_HEADER_SIG = 0x02014B50;
-
     /** Zip64 End Of Central Directory Record. */
-    const ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_SIG = 0x06064B50;
+    const ZIP64_END_OF_CD_RECORD_SIG = 0x06064B50;
 
     /** Zip64 End Of Central Directory Locator. */
-    const ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIG = 0x07064B50;
+    const ZIP64_END_OF_CD_LOCATOR_SIG = 0x07064B50;
 
     /** End Of Central Directory Record signature. */
-    const END_OF_CENTRAL_DIRECTORY_RECORD_SIG = 0x06054B50;
-
-    /**
-     * The minimum length of the Local File Header record.
-     *
-     * local file header signature      4
-     * version needed to extract        2
-     * general purpose bit flag         2
-     * compression method               2
-     * last mod file time               2
-     * last mod file date               2
-     * crc-32                           4
-     * compressed size                  4
-     * uncompressed size                4
-     * file name length                 2
-     * extra field length               2
-     */
-    const LOCAL_FILE_HEADER_MIN_LEN = 30;
+    const END_OF_CD_SIG = 0x06054B50;
 
     /**
      * The minimum length of the End Of Central Directory Record.
@@ -72,9 +47,9 @@ interface ZipConstants
      * central directory               4
      * relative offset of the zip64
      * end of central directory record 8
-     * total number of disks           4
+     * total number of disks           4.
      */
-    const ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_LEN = 20;
+    const ZIP64_END_OF_CD_LOCATOR_LEN = 20;
 
     /**
      * The minimum length of the Zip64 End Of Central Directory Record.
@@ -99,17 +74,84 @@ interface ZipConstants
      */
     const ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_MIN_LEN = 56;
 
-    /**
-     * Local File Header signature      4
-     * Version Needed To Extract        2
-     * General Purpose Bit Flags        2
-     * Compression Method               2
-     * Last Mod File Time               2
-     * Last Mod File Date               2
-     * CRC-32                           4
-     * Compressed Size                  4
-     * Uncompressed Size                4
-     */
-    const LOCAL_FILE_HEADER_FILE_NAME_LENGTH_POS = 26;
+    /** @var int Count files. */
+    private $entryCount;
 
-}
+    /** @var int Central Directory Offset. */
+    private $cdOffset;
+
+    /** @var int */
+    private $cdSize;
+
+    /** @var string|null The archive comment. */
+    private $comment;
+
+    /** @var bool Zip64 extension */
+    private $zip64;
+
+    /**
+     * EndOfCentralDirectory constructor.
+     *
+     * @param int        $entryCount
+     * @param int        $cdOffset
+     * @param int        $cdSize
+     * @param bool       $zip64
+     * @param mixed|null $comment
+     */
+    public function __construct($entryCount, $cdOffset, $cdSize, $zip64, $comment = null)
+    {
+        $this->entryCount = $entryCount;
+        $this->cdOffset = $cdOffset;
+        $this->cdSize = $cdSize;
+        $this->zip64 = $zip64;
+        $this->comment = $comment;
+    }
+
+    /**
+     * @param string|null $comment
+     */
+    public function setComment($comment)
+    {
+        $this->comment = $comment;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEntryCount()
+    {
+        return $this->entryCount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCdOffset()
+    {
+        return $this->cdOffset;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCdSize()
+    {
+        return $this->cdSize;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isZip64()
+    {
+        return $this->zip64;
+    }
+}

src/PhpZip/Model/Entry/OutputOffsetEntry.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Model\ZipEntry;
+
+/**
+ * Entry to write to the central directory.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ *
+ * @internal
+ */
+class OutputOffsetEntry
+{
+    /** @var int */
+    private $offset;
+
+    /** @var ZipEntry */
+    private $entry;
+
+    /**
+     * @param int      $pos
+     * @param ZipEntry $entry
+     */
+    public function __construct($pos, ZipEntry $entry)
+    {
+        $this->offset = $pos;
+        $this->entry = $entry;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOffset()
+    {
+        return $this->offset;
+    }
+
+    /**
+     * @return ZipEntry
+     */
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+}

src/PhpZip/Model/Entry/ZipAbstractEntry.php

@@ -0,0 +1,912 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\ExtraFieldsCollection;
+use PhpZip\Extra\ExtraFieldsFactory;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
+use PhpZip\Model\ZipEntry;
+use PhpZip\Util\DateTimeConverter;
+use PhpZip\Util\StringUtil;
+use PhpZip\ZipFile;
+
+/**
+ * Abstract ZIP entry.
+ *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+abstract class ZipAbstractEntry implements ZipEntry
+{
+    /** @var string Entry name (filename in archive) */
+    private $name;
+
+    /** @var int Made by platform */
+    private $createdOS = self::UNKNOWN;
+
+    /** @var int Extracted by platform */
+    private $extractedOS = self::UNKNOWN;
+
+    /** @var int */
+    private $softwareVersion = self::UNKNOWN;
+
+    /** @var int */
+    private $versionNeededToExtract = self::UNKNOWN;
+
+    /** @var int Compression method */
+    private $method = self::UNKNOWN;
+
+    /** @var int */
+    private $generalPurposeBitFlags = 0;
+
+    /** @var int Dos time */
+    private $dosTime = self::UNKNOWN;
+
+    /** @var int Crc32 */
+    private $crc = self::UNKNOWN;
+
+    /** @var int Compressed size */
+    private $compressedSize = self::UNKNOWN;
+
+    /** @var int Uncompressed size */
+    private $size = self::UNKNOWN;
+
+    /** @var int Internal attributes */
+    private $internalAttributes = 0;
+
+    /** @var int External attributes */
+    private $externalAttributes = 0;
+
+    /** @var int relative Offset Of Local File Header */
+    private $offset = 0;
+
+    /**
+     * Collections of Extra Fields.
+     * Keys from Header ID [int] and value Extra Field [ExtraField].
+     * Should be null or may be empty if no Extra Fields are used.
+     *
+     * @var ExtraFieldsCollection
+     */
+    private $extraFieldsCollection;
+
+    /** @var string|null comment field */
+    private $comment;
+
+    /** @var string entry password for read or write encryption data */
+    private $password;
+
+    /**
+     * Encryption method.
+     *
+     * @see ZipFile::ENCRYPTION_METHOD_TRADITIONAL
+     * @see ZipFile::ENCRYPTION_METHOD_WINZIP_AES_128
+     * @see ZipFile::ENCRYPTION_METHOD_WINZIP_AES_192
+     * @see ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256
+     *
+     * @var int
+     */
+    private $encryptionMethod = ZipFile::ENCRYPTION_METHOD_TRADITIONAL;
+
+    /** @var int */
+    private $compressionLevel = ZipFile::LEVEL_DEFAULT_COMPRESSION;
+
+    /**
+     * ZipAbstractEntry constructor.
+     */
+    public function __construct()
+    {
+        $this->extraFieldsCollection = new ExtraFieldsCollection();
+    }
+
+    /**
+     * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     */
+    public function setEntry(ZipEntry $entry)
+    {
+        $this->setName($entry->getName());
+        $this->setSoftwareVersion($entry->getSoftwareVersion());
+        $this->setCreatedOS($entry->getCreatedOS());
+        $this->setExtractedOS($entry->getExtractedOS());
+        $this->setVersionNeededToExtract($entry->getVersionNeededToExtract());
+        $this->setMethod($entry->getMethod());
+        $this->setGeneralPurposeBitFlags($entry->getGeneralPurposeBitFlags());
+        $this->setDosTime($entry->getDosTime());
+        $this->setCrc($entry->getCrc());
+        $this->setCompressedSize($entry->getCompressedSize());
+        $this->setSize($entry->getSize());
+        $this->setInternalAttributes($entry->getInternalAttributes());
+        $this->setExternalAttributes($entry->getExternalAttributes());
+        $this->setOffset($entry->getOffset());
+        $this->setExtra($entry->getExtra());
+        $this->setComment($entry->getComment());
+        $this->setPassword($entry->getPassword());
+        $this->setEncryptionMethod($entry->getEncryptionMethod());
+        $this->setCompressionLevel($entry->getCompressionLevel());
+        $this->setEncrypted($entry->isEncrypted());
+    }
+
+    /**
+     * Returns the ZIP entry name.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set entry name.
+     *
+     * @param string $name New entry name
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function setName($name)
+    {
+        $length = \strlen($name);
+
+        if ($length < 0x0000 || $length > 0xffff) {
+            throw new ZipException('Illegal zip entry name parameter');
+        }
+        $this->setGeneralPurposeBitFlag(self::GPBF_UTF8, true);
+        $this->name = $name;
+        $this->externalAttributes = $this->isDirectory() ? 0x10 : 0;
+
+        return $this;
+    }
+
+    /**
+     * Sets the indexed General Purpose Bit Flag.
+     *
+     * @param int  $mask
+     * @param bool $bit
+     *
+     * @return ZipEntry
+     */
+    public function setGeneralPurposeBitFlag($mask, $bit)
+    {
+        if ($bit) {
+            $this->generalPurposeBitFlags |= $mask;
+        } else {
+            $this->generalPurposeBitFlags &= ~$mask;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return int Get platform
+     *
+     * @deprecated Use {@see ZipEntry::getCreatedOS()}
+     * @noinspection PhpUsageOfSilenceOperatorInspection
+     */
+    public function getPlatform()
+    {
+        @trigger_error('ZipEntry::getPlatform() is deprecated. Use ZipEntry::getCreatedOS()', \E_USER_DEPRECATED);
+
+        return $this->getCreatedOS();
+    }
+
+    /**
+     * @param int $platform
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     *
+     * @deprecated Use {@see ZipEntry::setCreatedOS()}
+     * @noinspection PhpUsageOfSilenceOperatorInspection
+     */
+    public function setPlatform($platform)
+    {
+        @trigger_error('ZipEntry::setPlatform() is deprecated. Use ZipEntry::setCreatedOS()', \E_USER_DEPRECATED);
+
+        return $this->setCreatedOS($platform);
+    }
+
+    /**
+     * @return int platform
+     */
+    public function getCreatedOS()
+    {
+        return $this->createdOS;
+    }
+
+    /**
+     * Set platform.
+     *
+     * @param int $platform
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function setCreatedOS($platform)
+    {
+        $platform = (int) $platform;
+
+        if ($platform < 0x00 || $platform > 0xff) {
+            throw new ZipException('Platform out of range');
+        }
+        $this->createdOS = $platform;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getExtractedOS()
+    {
+        return $this->extractedOS;
+    }
+
+    /**
+     * Set extracted OS.
+     *
+     * @param int $platform
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function setExtractedOS($platform)
+    {
+        $platform = (int) $platform;
+
+        if ($platform < 0x00 || $platform > 0xff) {
+            throw new ZipException('Platform out of range');
+        }
+        $this->extractedOS = $platform;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSoftwareVersion()
+    {
+        return $this->softwareVersion;
+    }
+
+    /**
+     * @param int $softwareVersion
+     *
+     * @return ZipEntry
+     */
+    public function setSoftwareVersion($softwareVersion)
+    {
+        $this->softwareVersion = (int) $softwareVersion;
+
+        return $this;
+    }
+
+    /**
+     * Version needed to extract.
+     *
+     * @return int
+     */
+    public function getVersionNeededToExtract()
+    {
+        if ($this->versionNeededToExtract === self::UNKNOWN) {
+            $method = $this->getMethod();
+
+            if ($method === self::METHOD_WINZIP_AES) {
+                return 51;
+            }
+
+            if ($method === ZipFile::METHOD_BZIP2) {
+                return 46;
+            }
+
+            if ($this->isZip64ExtensionsRequired()) {
+                return 45;
+            }
+
+            return $method === ZipFile::METHOD_DEFLATED || $this->isDirectory() ? 20 : 10;
+        }
+
+        return $this->versionNeededToExtract;
+    }
+
+    /**
+     * Set version needed to extract.
+     *
+     * @param int $version
+     *
+     * @return ZipEntry
+     */
+    public function setVersionNeededToExtract($version)
+    {
+        $this->versionNeededToExtract = $version;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isZip64ExtensionsRequired()
+    {
+        return $this->getCompressedSize() >= 0xffffffff
+            || $this->getSize() >= 0xffffffff;
+    }
+
+    /**
+     * Returns the compressed size of this entry.
+     *
+     * @see int
+     */
+    public function getCompressedSize()
+    {
+        return $this->compressedSize;
+    }
+
+    /**
+     * Sets the compressed size of this entry.
+     *
+     * @param int $compressedSize the Compressed Size
+     *
+     * @return ZipEntry
+     */
+    public function setCompressedSize($compressedSize)
+    {
+        $this->compressedSize = $compressedSize;
+
+        return $this;
+    }
+
+    /**
+     * Returns the uncompressed size of this entry.
+     *
+     * @see ZipEntry::setCompressedSize
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+
+    /**
+     * Sets the uncompressed size of this entry.
+     *
+     * @param int $size the (Uncompressed) Size
+     *
+     * @return ZipEntry
+     */
+    public function setSize($size)
+    {
+        $this->size = $size;
+
+        return $this;
+    }
+
+    /**
+     * Return relative Offset Of Local File Header.
+     *
+     * @return int
+     */
+    public function getOffset()
+    {
+        return $this->offset;
+    }
+
+    /**
+     * @param int $offset
+     *
+     * @return ZipEntry
+     */
+    public function setOffset($offset)
+    {
+        $this->offset = (int) $offset;
+
+        return $this;
+    }
+
+    /**
+     * Returns the General Purpose Bit Flags.
+     *
+     * @return int
+     */
+    public function getGeneralPurposeBitFlags()
+    {
+        return $this->generalPurposeBitFlags & 0xffff;
+    }
+
+    /**
+     * Sets the General Purpose Bit Flags.
+     *
+     * @param mixed $general
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     *
+     * @var int general
+     */
+    public function setGeneralPurposeBitFlags($general)
+    {
+        if ($general < 0x0000 || $general > 0xffff) {
+            throw new ZipException('general out of range');
+        }
+        $this->generalPurposeBitFlags = $general;
+
+        if ($this->method === ZipFile::METHOD_DEFLATED) {
+            $bit1 = $this->getGeneralPurposeBitFlag(self::GPBF_COMPRESSION_FLAG1);
+            $bit2 = $this->getGeneralPurposeBitFlag(self::GPBF_COMPRESSION_FLAG2);
+
+            if ($bit1 && !$bit2) {
+                $this->compressionLevel = ZipFile::LEVEL_BEST_COMPRESSION;
+            } elseif (!$bit1 && $bit2) {
+                $this->compressionLevel = ZipFile::LEVEL_FAST;
+            } elseif ($bit1 && $bit2) {
+                $this->compressionLevel = ZipFile::LEVEL_SUPER_FAST;
+            } else {
+                $this->compressionLevel = ZipFile::LEVEL_DEFAULT_COMPRESSION;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns true if and only if this ZIP entry is encrypted.
+     *
+     * @return bool
+     */
+    public function isEncrypted()
+    {
+        return $this->getGeneralPurposeBitFlag(self::GPBF_ENCRYPTED);
+    }
+
+    /**
+     * Returns the indexed General Purpose Bit Flag.
+     *
+     * @param int $mask
+     *
+     * @return bool
+     */
+    public function getGeneralPurposeBitFlag($mask)
+    {
+        return ($this->generalPurposeBitFlags & $mask) !== 0;
+    }
+
+    /**
+     * Sets the encryption property to false and removes any other
+     * encryption artifacts.
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function disableEncryption()
+    {
+        $this->setEncrypted(false);
+        $headerId = WinZipAesEntryExtraField::getHeaderId();
+
+        if (isset($this->extraFieldsCollection[$headerId])) {
+            /** @var WinZipAesEntryExtraField $field */
+            $field = $this->extraFieldsCollection[$headerId];
+
+            if ($this->getMethod() === self::METHOD_WINZIP_AES) {
+                $this->setMethod($field === null ? self::UNKNOWN : $field->getMethod());
+            }
+            unset($this->extraFieldsCollection[$headerId]);
+        }
+        $this->password = null;
+
+        return $this;
+    }
+
+    /**
+     * Sets the encryption flag for this ZIP entry.
+     *
+     * @param bool $encrypted
+     *
+     * @return ZipEntry
+     */
+    public function setEncrypted($encrypted)
+    {
+        $encrypted = (bool) $encrypted;
+        $this->setGeneralPurposeBitFlag(self::GPBF_ENCRYPTED, $encrypted);
+
+        return $this;
+    }
+
+    /**
+     * Returns the compression method for this entry.
+     *
+     * @return int
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * Sets the compression method for this entry.
+     *
+     * @param int $method
+     *
+     * @throws ZipException if method is not STORED, DEFLATED, BZIP2 or UNKNOWN
+     *
+     * @return ZipEntry
+     */
+    public function setMethod($method)
+    {
+        if ($method === self::UNKNOWN) {
+            $this->method = $method;
+
+            return $this;
+        }
+
+        if ($method < 0x0000 || $method > 0xffff) {
+            throw new ZipException('method out of range: ' . $method);
+        }
+        switch ($method) {
+            case self::METHOD_WINZIP_AES:
+            case ZipFile::METHOD_STORED:
+            case ZipFile::METHOD_DEFLATED:
+            case ZipFile::METHOD_BZIP2:
+                $this->method = $method;
+                break;
+
+            default:
+                throw new ZipException($this->name . " (unsupported compression method {$method})");
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Unix Timestamp.
+     *
+     * @return int
+     */
+    public function getTime()
+    {
+        if ($this->getDosTime() === self::UNKNOWN) {
+            return self::UNKNOWN;
+        }
+
+        return DateTimeConverter::toUnixTimestamp($this->getDosTime());
+    }
+
+    /**
+     * Get Dos Time.
+     *
+     * @return int
+     */
+    public function getDosTime()
+    {
+        return $this->dosTime;
+    }
+
+    /**
+     * Set Dos Time.
+     *
+     * @param int $dosTime
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function setDosTime($dosTime)
+    {
+        $dosTime = (int) $dosTime;
+
+        if ($dosTime < 0x00000000 || $dosTime > 0xffffffff) {
+            throw new ZipException('DosTime out of range');
+        }
+        $this->dosTime = $dosTime;
+
+        return $this;
+    }
+
+    /**
+     * Set time from unix timestamp.
+     *
+     * @param int $unixTimestamp
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function setTime($unixTimestamp)
+    {
+        $known = $unixTimestamp !== self::UNKNOWN;
+
+        if ($known) {
+            $this->dosTime = DateTimeConverter::toDosTime($unixTimestamp);
+        } else {
+            $this->dosTime = 0;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the external file attributes.
+     *
+     * @return int the external file attributes
+     */
+    public function getExternalAttributes()
+    {
+        return $this->externalAttributes;
+    }
+
+    /**
+     * Sets the external file attributes.
+     *
+     * @param int $externalAttributes the external file attributes
+     *
+     * @return ZipEntry
+     */
+    public function setExternalAttributes($externalAttributes)
+    {
+        $this->externalAttributes = $externalAttributes;
+
+        return $this;
+    }
+
+    /**
+     * Sets the internal file attributes.
+     *
+     * @param int $attributes the internal file attributes
+     *
+     * @return ZipEntry
+     */
+    public function setInternalAttributes($attributes)
+    {
+        $this->internalAttributes = (int) $attributes;
+
+        return $this;
+    }
+
+    /**
+     * Returns the internal file attributes.
+     *
+     * @return int the internal file attributes
+     */
+    public function getInternalAttributes()
+    {
+        return $this->internalAttributes;
+    }
+
+    /**
+     * Returns true if and only if this ZIP entry represents a directory entry
+     * (i.e. end with '/').
+     *
+     * @return bool
+     */
+    public function isDirectory()
+    {
+        return StringUtil::endsWith($this->name, '/');
+    }
+
+    /**
+     * @return ExtraFieldsCollection
+     */
+    public function &getExtraFieldsCollection()
+    {
+        return $this->extraFieldsCollection;
+    }
+
+    /**
+     * Returns a protective copy of the serialized Extra Fields.
+     *
+     * @throws ZipException
+     *
+     * @return string
+     */
+    public function getExtra()
+    {
+        return ExtraFieldsFactory::createSerializedData($this->extraFieldsCollection);
+    }
+
+    /**
+     * Sets the serialized Extra Fields by making a protective copy.
+     * Note that this method parses the serialized Extra Fields according to
+     * the ZIP File Format Specification and limits its size to 64 KB.
+     * Therefore, this property cannot not be used to hold arbitrary
+     * (application) data.
+     * Consider storing such data in a separate entry instead.
+     *
+     * @param string $data the byte array holding the serialized Extra Fields
+     *
+     * @throws ZipException if the serialized Extra Fields exceed 64 KB
+     *
+     * @return ZipEntry
+     */
+    public function setExtra($data)
+    {
+        $this->extraFieldsCollection = ExtraFieldsFactory::createExtraFieldCollections($data, $this);
+
+        return $this;
+    }
+
+    /**
+     * Returns comment entry.
+     *
+     * @return string
+     */
+    public function getComment()
+    {
+        return $this->comment !== null ? $this->comment : '';
+    }
+
+    /**
+     * Set entry comment.
+     *
+     * @param string|null $comment
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function setComment($comment)
+    {
+        if ($comment !== null) {
+            $commentLength = \strlen($comment);
+
+            if ($commentLength < 0x0000 || $commentLength > 0xffff) {
+                throw new ZipException('Comment too long');
+            }
+            $this->setGeneralPurposeBitFlag(self::GPBF_UTF8, true);
+        }
+        $this->comment = $comment;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDataDescriptorRequired()
+    {
+        return ($this->getCrc() | $this->getCompressedSize() | $this->getSize()) === self::UNKNOWN;
+    }
+
+    /**
+     * Return crc32 content or 0 for WinZip AES v2.
+     *
+     * @return int
+     */
+    public function getCrc()
+    {
+        return $this->crc;
+    }
+
+    /**
+     * Set crc32 content.
+     *
+     * @param int $crc
+     *
+     * @return ZipEntry
+     */
+    public function setCrc($crc)
+    {
+        $this->crc = (int) $crc;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * Set password and encryption method from entry.
+     *
+     * @param string   $password
+     * @param int|null $encryptionMethod
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function setPassword($password, $encryptionMethod = null)
+    {
+        $this->password = $password;
+
+        if ($encryptionMethod !== null) {
+            $this->setEncryptionMethod($encryptionMethod);
+        }
+
+        if (!empty($this->password)) {
+            $this->setEncrypted(true);
+        } else {
+            $this->disableEncryption();
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEncryptionMethod()
+    {
+        return $this->encryptionMethod;
+    }
+
+    /**
+     * Set encryption method.
+     *
+     * @param int $encryptionMethod
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     *
+     * @see ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256
+     * @see ZipFile::ENCRYPTION_METHOD_TRADITIONAL
+     * @see ZipFile::ENCRYPTION_METHOD_WINZIP_AES_128
+     * @see ZipFile::ENCRYPTION_METHOD_WINZIP_AES_192
+     */
+    public function setEncryptionMethod($encryptionMethod)
+    {
+        if ($encryptionMethod !== null) {
+            if (
+                $encryptionMethod !== ZipFile::ENCRYPTION_METHOD_TRADITIONAL
+                && $encryptionMethod !== ZipFile::ENCRYPTION_METHOD_WINZIP_AES_128
+                && $encryptionMethod !== ZipFile::ENCRYPTION_METHOD_WINZIP_AES_192
+                && $encryptionMethod !== ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256
+            ) {
+                throw new ZipException('Invalid encryption method');
+            }
+            $this->encryptionMethod = $encryptionMethod;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompressionLevel()
+    {
+        return $this->compressionLevel;
+    }
+
+    /**
+     * @param int $compressionLevel
+     *
+     * @return ZipEntry
+     */
+    public function setCompressionLevel($compressionLevel = ZipFile::LEVEL_DEFAULT_COMPRESSION)
+    {
+        if ($compressionLevel < ZipFile::LEVEL_DEFAULT_COMPRESSION ||
+            $compressionLevel > ZipFile::LEVEL_BEST_COMPRESSION
+        ) {
+            throw new InvalidArgumentException(
+                'Invalid compression level. Minimum level ' .
+                ZipFile::LEVEL_DEFAULT_COMPRESSION . '. Maximum level ' . ZipFile::LEVEL_BEST_COMPRESSION
+            );
+        }
+        $this->compressionLevel = $compressionLevel;
+
+        return $this;
+    }
+
+    /**
+     * Clone extra fields.
+     */
+    public function __clone()
+    {
+        $this->extraFieldsCollection = clone $this->extraFieldsCollection;
+    }
+}

src/PhpZip/Model/Entry/ZipChangesEntry.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\ZipException;
+
+/**
+ * Source Entry Changes.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ *
+ * @internal
+ */
+class ZipChangesEntry extends ZipAbstractEntry
+{
+    /** @var ZipSourceEntry */
+    protected $entry;
+
+    /**
+     * ZipChangesEntry constructor.
+     *
+     * @param ZipSourceEntry $entry
+     *
+     * @throws ZipException
+     * @throws InvalidArgumentException
+     */
+    public function __construct(ZipSourceEntry $entry)
+    {
+        parent::__construct();
+        $this->entry = $entry;
+        $this->setEntry($entry);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isChangedContent()
+    {
+        return !(
+            $this->getCompressionLevel() === $this->entry->getCompressionLevel() &&
+            $this->getMethod() === $this->entry->getMethod() &&
+            $this->isEncrypted() === $this->entry->isEncrypted() &&
+            $this->getEncryptionMethod() === $this->entry->getEncryptionMethod() &&
+            $this->getPassword() === $this->entry->getPassword()
+        );
+    }
+
+    /**
+     * Returns an string content of the given entry.
+     *
+     * @throws ZipException
+     *
+     * @return string|null
+     */
+    public function getEntryContent()
+    {
+        return $this->entry->getEntryContent();
+    }
+
+    /**
+     * @return ZipSourceEntry
+     */
+    public function getSourceEntry()
+    {
+        return $this->entry;
+    }
+}

src/PhpZip/Model/Entry/ZipNewEntry.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Exception\InvalidArgumentException;
+
+/**
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipNewEntry extends ZipAbstractEntry
+{
+    /** @var resource|string|null */
+    protected $content;
+
+    /** @var bool */
+    private $clone = false;
+
+    /**
+     * ZipNewEntry constructor.
+     *
+     * @param string|resource|null $content
+     */
+    public function __construct($content = null)
+    {
+        parent::__construct();
+
+        if ($content !== null && !\is_string($content) && !\is_resource($content)) {
+            throw new InvalidArgumentException('invalid content');
+        }
+        $this->content = $content;
+    }
+
+    /**
+     * Returns an string content of the given entry.
+     *
+     * @return string|null
+     */
+    public function getEntryContent()
+    {
+        if (\is_resource($this->content)) {
+            if (stream_get_meta_data($this->content)['seekable']) {
+                rewind($this->content);
+            }
+
+            return stream_get_contents($this->content);
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * Clone extra fields.
+     */
+    public function __clone()
+    {
+        $this->clone = true;
+        parent::__clone();
+    }
+
+    public function __destruct()
+    {
+        if (!$this->clone && $this->content !== null && \is_resource($this->content)) {
+            fclose($this->content);
+            $this->content = null;
+        }
+    }
+}

src/PhpZip/Model/Entry/ZipNewFileEntry.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\RuntimeException;
+use PhpZip\Exception\ZipException;
+
+/**
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipNewFileEntry extends ZipAbstractEntry
+{
+    /** @var string Filename */
+    protected $file;
+
+    /**
+     * ZipNewEntry constructor.
+     *
+     * @param string $file
+     *
+     * @throws ZipException
+     */
+    public function __construct($file)
+    {
+        parent::__construct();
+
+        if ($file === null) {
+            throw new InvalidArgumentException('file is null');
+        }
+        $file = (string) $file;
+
+        if (!is_file($file)) {
+            throw new ZipException("File {$file} does not exist.");
+        }
+
+        if (!is_readable($file)) {
+            throw new ZipException("The '{$file}' file could not be read. Check permissions.");
+        }
+        $this->file = $file;
+    }
+
+    /**
+     * Returns an string content of the given entry.
+     *
+     * @return string|null
+     */
+    public function getEntryContent()
+    {
+        if (!is_file($this->file)) {
+            throw new RuntimeException("File {$this->file} does not exist.");
+        }
+
+        return file_get_contents($this->file);
+    }
+}

src/PhpZip/Model/Entry/ZipSourceEntry.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Exception\ZipException;
+use PhpZip\Stream\ZipInputStreamInterface;
+
+/**
+ * This class is used to represent a ZIP file entry.
+ *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipSourceEntry extends ZipAbstractEntry
+{
+    /** Max size cached content in memory. */
+    const MAX_SIZE_CACHED_CONTENT_IN_MEMORY = 524288; // 512 kb
+
+    /** @var ZipInputStreamInterface */
+    protected $inputStream;
+
+    /** @var string|resource cached entry content */
+    protected $entryContent;
+
+    /** @var bool */
+    private $clone = false;
+
+    /**
+     * ZipSourceEntry constructor.
+     *
+     * @param ZipInputStreamInterface $inputStream
+     */
+    public function __construct(ZipInputStreamInterface $inputStream)
+    {
+        parent::__construct();
+        $this->inputStream = $inputStream;
+    }
+
+    /**
+     * @return ZipInputStreamInterface
+     */
+    public function getInputStream()
+    {
+        return $this->inputStream;
+    }
+
+    /**
+     * Returns an string content of the given entry.
+     *
+     * @throws ZipException
+     *
+     * @return string
+     */
+    public function getEntryContent()
+    {
+        if ($this->entryContent === null) {
+            // In order not to unpack again, we cache the content in memory or on disk
+            $content = $this->inputStream->readEntryContent($this);
+
+            if ($this->getSize() < self::MAX_SIZE_CACHED_CONTENT_IN_MEMORY) {
+                $this->entryContent = $content;
+            } else {
+                $this->entryContent = fopen('php://temp', 'r+b');
+                fwrite($this->entryContent, $content);
+            }
+
+            return $content;
+        }
+
+        if (\is_resource($this->entryContent)) {
+            rewind($this->entryContent);
+
+            return stream_get_contents($this->entryContent);
+        }
+
+        return $this->entryContent;
+    }
+
+    /**
+     * Clone extra fields.
+     */
+    public function __clone()
+    {
+        $this->clone = true;
+        parent::__clone();
+    }
+
+    public function __destruct()
+    {
+        if (!$this->clone && $this->entryContent !== null && \is_resource($this->entryContent)) {
+            fclose($this->entryContent);
+        }
+    }
+}

src/PhpZip/Model/ZipEntryMatcher.php

@@ -0,0 +1,200 @@
+<?php
+
+namespace PhpZip\Model;
+
+/**
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipEntryMatcher implements \Countable
+{
+    /** @var ZipModel */
+    protected $zipModel;
+
+    /** @var array */
+    protected $matches = [];
+
+    /**
+     * ZipEntryMatcher constructor.
+     *
+     * @param ZipModel $zipModel
+     */
+    public function __construct(ZipModel $zipModel)
+    {
+        $this->zipModel = $zipModel;
+    }
+
+    /**
+     * @param string|array $entries
+     *
+     * @return ZipEntryMatcher
+     */
+    public function add($entries)
+    {
+        $entries = (array) $entries;
+        $entries = array_map(
+            static function ($entry) {
+                return $entry instanceof ZipEntry ? $entry->getName() : (string) $entry;
+            },
+            $entries
+        );
+        $this->matches = array_values(
+            array_map(
+                'strval',
+                array_unique(
+                    array_merge(
+                        $this->matches,
+                        array_keys(
+                            array_intersect_key(
+                                $this->zipModel->getEntries(),
+                                array_flip($entries)
+                            )
+                        )
+                    )
+                )
+            )
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param string $regexp
+     *
+     * @return ZipEntryMatcher
+     */
+    public function match($regexp)
+    {
+        array_walk(
+            $this->zipModel->getEntries(),
+            function (
+                /** @noinspection PhpUnusedParameterInspection */
+                $entry,
+                $entryName
+            ) use ($regexp) {
+                if (preg_match($regexp, $entryName)) {
+                    $this->matches[] = (string) $entryName;
+                }
+            }
+        );
+        $this->matches = array_unique($this->matches);
+
+        return $this;
+    }
+
+    /**
+     * @return ZipEntryMatcher
+     */
+    public function all()
+    {
+        $this->matches = array_keys($this->zipModel->getEntries());
+
+        return $this;
+    }
+
+    /**
+     * Callable function for all select entries.
+     *
+     * Callable function signature:
+     * function(string $entryName){}
+     *
+     * @param callable $callable
+     */
+    public function invoke(callable $callable)
+    {
+        if (!empty($this->matches)) {
+            array_walk(
+                $this->matches,
+                static function ($entryName) use ($callable) {
+                    $callable($entryName);
+                }
+            );
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getMatches()
+    {
+        return $this->matches;
+    }
+
+    public function delete()
+    {
+        array_walk(
+            $this->matches,
+            function ($entry) {
+                $this->zipModel->deleteEntry($entry);
+            }
+        );
+        $this->matches = [];
+    }
+
+    /**
+     * @param string|null $password
+     * @param int|null    $encryptionMethod
+     */
+    public function setPassword($password, $encryptionMethod = null)
+    {
+        array_walk(
+            $this->matches,
+            function ($entry) use ($password, $encryptionMethod) {
+                $entry = $this->zipModel->getEntry($entry);
+
+                if (!$entry->isDirectory()) {
+                    $this->zipModel->getEntryForChanges($entry)->setPassword($password, $encryptionMethod);
+                }
+            }
+        );
+    }
+
+    /**
+     * @param int $encryptionMethod
+     */
+    public function setEncryptionMethod($encryptionMethod)
+    {
+        array_walk(
+            $this->matches,
+            function ($entry) use ($encryptionMethod) {
+                $entry = $this->zipModel->getEntry($entry);
+
+                if (!$entry->isDirectory()) {
+                    $this->zipModel->getEntryForChanges($entry)->setEncryptionMethod($encryptionMethod);
+                }
+            }
+        );
+    }
+
+    public function disableEncryption()
+    {
+        array_walk(
+            $this->matches,
+            function ($entry) {
+                $entry = $this->zipModel->getEntry($entry);
+
+                if (!$entry->isDirectory()) {
+                    $entry = $this->zipModel->getEntryForChanges($entry);
+                    $entry->disableEncryption();
+                }
+            }
+        );
+    }
+
+    /**
+     * Count elements of an object.
+     *
+     * @see http://php.net/manual/en/countable.count.php
+     *
+     * @return int The custom count as an integer.
+     *             </p>
+     *             <p>
+     *             The return value is cast to an integer.
+     *
+     * @since 5.1.0
+     */
+    public function count()
+    {
+        return \count($this->matches);
+    }
+}

src/PhpZip/Model/ZipInfo.php

@@ -1,12 +1,15 @@
 <?php
+
 namespace PhpZip\Model;
 
-use PhpZip\Extra\NtfsExtraField;
-use PhpZip\Extra\WinZipAesEntryExtraField;
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\Fields\NtfsExtraField;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
 use PhpZip\Util\FilesUtil;
+use PhpZip\ZipFile;
 
 /**
- * Zip info
+ * Zip info.
  *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
@@ -15,53 +18,96 @@ class ZipInfo
 {
     // made by constants
     const MADE_BY_MS_DOS = 0;
+
     const MADE_BY_AMIGA = 1;
+
     const MADE_BY_OPEN_VMS = 2;
+
     const MADE_BY_UNIX = 3;
+
     const MADE_BY_VM_CMS = 4;
+
     const MADE_BY_ATARI = 5;
+
     const MADE_BY_OS_2 = 6;
+
     const MADE_BY_MACINTOSH = 7;
+
     const MADE_BY_Z_SYSTEM = 8;
+
     const MADE_BY_CP_M = 9;
+
     const MADE_BY_WINDOWS_NTFS = 10;
+
     const MADE_BY_MVS = 11;
+
     const MADE_BY_VSE = 12;
+
     const MADE_BY_ACORN_RISC = 13;
+
     const MADE_BY_VFAT = 14;
+
     const MADE_BY_ALTERNATE_MVS = 15;
+
     const MADE_BY_BEOS = 16;
+
     const MADE_BY_TANDEM = 17;
+
     const MADE_BY_OS_400 = 18;
+
     const MADE_BY_OS_X = 19;
+
     const MADE_BY_UNKNOWN = 20;
 
-    const UNX_IFMT = 0170000;    /* Unix file type mask */
-    const UNX_IFREG = 0100000;    /* Unix regular file */
-    const UNX_IFSOCK = 0140000;     /* Unix socket (BSD, not SysV or Amiga) */
-    const UNX_IFLNK = 0120000;    /* Unix symbolic link (not SysV, Amiga) */
-    const UNX_IFBLK = 0060000;    /* Unix block special       (not Amiga) */
-    const UNX_IFDIR = 0040000;    /* Unix directory */
-    const UNX_IFCHR = 0020000;    /* Unix character special   (not Amiga) */
-    const UNX_IFIFO = 0010000;    /* Unix fifo    (BCC, not MSC or Amiga) */
-    const UNX_ISUID = 04000;      /* Unix set user id on execution */
-    const UNX_ISGID = 02000;      /* Unix set group id on execution */
-    const UNX_ISVTX = 01000;      /* Unix directory permissions control */
-    const UNX_ENFMT = self::UNX_ISGID;  /* Unix record locking enforcement flag */
-    const UNX_IRWXU = 00700;      /* Unix read, write, execute: owner */
-    const UNX_IRUSR = 00400;      /* Unix read permission: owner */
-    const UNX_IWUSR = 00200;      /* Unix write permission: owner */
-    const UNX_IXUSR = 00100;      /* Unix execute permission: owner */
-    const UNX_IRWXG = 00070;      /* Unix read, write, execute: group */
-    const UNX_IRGRP = 00040;      /* Unix read permission: group */
-    const UNX_IWGRP = 00020;      /* Unix write permission: group */
-    const UNX_IXGRP = 00010;      /* Unix execute permission: group */
-    const UNX_IRWXO = 00007;      /* Unix read, write, execute: other */
-    const UNX_IROTH = 00004;      /* Unix read permission: other */
-    const UNX_IWOTH = 00002;      /* Unix write permission: other */
-    const UNX_IXOTH = 00001;      /* Unix execute permission: other */
+    const UNX_IFMT = 0170000;    // Unix file type mask
 
-    private static $valuesMadeBy = [
+    const UNX_IFREG = 0100000;    // Unix regular file
+
+    const UNX_IFSOCK = 0140000;     // Unix socket (BSD, not SysV or Amiga)
+
+    const UNX_IFLNK = 0120000;    // Unix symbolic link (not SysV, Amiga)
+
+    const UNX_IFBLK = 0060000;    // Unix block special       (not Amiga)
+
+    const UNX_IFDIR = 0040000;    // Unix directory
+
+    const UNX_IFCHR = 0020000;    // Unix character special   (not Amiga)
+
+    const UNX_IFIFO = 0010000;    // Unix fifo    (BCC, not MSC or Amiga)
+
+    const UNX_ISUID = 04000;      // Unix set user id on execution
+
+    const UNX_ISGID = 02000;      // Unix set group id on execution
+
+    const UNX_ISVTX = 01000;      // Unix directory permissions control
+
+    const UNX_ENFMT = self::UNX_ISGID;  // Unix record locking enforcement flag
+
+    const UNX_IRWXU = 00700;      // Unix read, write, execute: owner
+
+    const UNX_IRUSR = 00400;      // Unix read permission: owner
+
+    const UNX_IWUSR = 00200;      // Unix write permission: owner
+
+    const UNX_IXUSR = 00100;      // Unix execute permission: owner
+
+    const UNX_IRWXG = 00070;      // Unix read, write, execute: group
+
+    const UNX_IRGRP = 00040;      // Unix read permission: group
+
+    const UNX_IWGRP = 00020;      // Unix write permission: group
+
+    const UNX_IXGRP = 00010;      // Unix execute permission: group
+
+    const UNX_IRWXO = 00007;      // Unix read, write, execute: other
+
+    const UNX_IROTH = 00004;      // Unix read permission: other
+
+    const UNX_IWOTH = 00002;      // Unix write permission: other
+
+    const UNX_IXOTH = 00001;      // Unix execute permission: other
+
+    private static $platformNames = [
         self::MADE_BY_MS_DOS => 'FAT',
         self::MADE_BY_AMIGA => 'Amiga',
         self::MADE_BY_OPEN_VMS => 'OpenVMS',
@@ -84,8 +130,9 @@ class ZipInfo
         self::MADE_BY_OS_X => 'Mac OS X',
     ];
 
-    private static $valuesCompressionMethod = [
-        ZipEntry::METHOD_STORED => 'no compression',
+    private static $compressionMethodNames = [
+        ZipEntry::UNKNOWN => 'unknown',
+        ZipFile::METHOD_STORED => 'no compression',
         1 => 'shrink',
         2 => 'reduce level 1',
         3 => 'reduce level 2',
@@ -93,7 +140,7 @@ class ZipInfo
         5 => 'reduce level 4',
         6 => 'implode',
         7 => 'reserved for Tokenizing compression algorithm',
-        ZipEntry::METHOD_DEFLATED => 'deflate',
+        ZipFile::METHOD_DEFLATED => 'deflate',
         9 => 'deflate64',
         10 => 'PKWARE Data Compression Library Imploding (old IBM TERSE)',
         11 => 'reserved by PKWARE',
@@ -107,83 +154,67 @@ class ZipInfo
         19 => 'IBM LZ77 z Architecture (PFS)',
         97 => 'WavPack',
         98 => 'PPMd version I, Rev 1',
-        ZipEntry::WINZIP_AES => 'WinZip AES',
+        ZipEntry::METHOD_WINZIP_AES => 'WinZip AES',
     ];
 
-    /**
-     * @var string
-     */
-    private $path;
+    /** @var string */
+    private $name;
 
-    /**
-     * @var bool
-     */
+    /** @var bool */
     private $folder;
 
-    /**
-     * @var int
-     */
+    /** @var int */
     private $size;
 
-    /**
-     * @var int
-     */
+    /** @var int */
     private $compressedSize;
 
-    /**
-     * @var int
-     */
+    /** @var int */
     private $mtime;
 
-    /**
-     * @var int|null
-     */
+    /** @var int|null */
     private $ctime;
 
-    /**
-     * @var int|null
-     */
+    /** @var int|null */
     private $atime;
 
-    /**
-     * @var bool
-     */
+    /** @var bool */
     private $encrypted;
 
-    /**
-     * @var string|null
-     */
+    /** @var string|null */
     private $comment;
 
-    /**
-     * @var int
-     */
+    /** @var int */
     private $crc;
 
-    /**
-     * @var string
-     */
-    private $method;
+    /** @var string */
+    private $methodName;
 
-    /**
-     * @var string
-     */
+    /** @var int */
+    private $compressionMethod;
+
+    /** @var string */
     private $platform;
 
-    /**
-     * @var int
-     */
+    /** @var int */
     private $version;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $attributes;
 
+    /** @var int|null */
+    private $encryptionMethod;
+
+    /** @var int|null */
+    private $compressionLevel;
+
     /**
      * ZipInfo constructor.
      *
      * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     * @noinspection PhpMissingBreakStatementInspection
      */
     public function __construct(ZipEntry $entry)
     {
@@ -191,16 +222,18 @@ class ZipInfo
         $atime = null;
         $ctime = null;
 
-        $field = $entry->getExtraField(NtfsExtraField::getHeaderId());
-        if ($field !== null && $field instanceof NtfsExtraField) {
+        $field = $entry->getExtraFieldsCollection()->get(NtfsExtraField::getHeaderId());
+
+        if ($field instanceof NtfsExtraField) {
             /**
              * @var NtfsExtraField $field
              */
             $atime = $field->getAtime();
             $ctime = $field->getCtime();
+            $mtime = $field->getMtime();
         }
 
-        $this->path = $entry->getName();
+        $this->name = $entry->getName();
         $this->folder = $entry->isDirectory();
         $this->size = $entry->getSize();
         $this->compressedSize = $entry->getCompressedSize();
@@ -208,175 +241,211 @@ class ZipInfo
         $this->ctime = $ctime;
         $this->atime = $atime;
         $this->encrypted = $entry->isEncrypted();
+        $this->encryptionMethod = $entry->getEncryptionMethod();
         $this->comment = $entry->getComment();
         $this->crc = $entry->getCrc();
-        $this->method = self::getMethodName($entry);
+        $this->compressionMethod = self::getMethodId($entry);
+        $this->methodName = self::getEntryMethodName($entry);
         $this->platform = self::getPlatformName($entry);
         $this->version = $entry->getVersionNeededToExtract();
+        $this->compressionLevel = $entry->getCompressionLevel();
 
-        $attribs = str_repeat(" ", 12);
-        $xattr = (($entry->getRawExternalAttributes() >> 16) & 0xFFFF);
-        switch ($entry->getPlatform()) {
+        $attributes = str_repeat(' ', 12);
+        $externalAttributes = $entry->getExternalAttributes();
+        $xattr = (($externalAttributes >> 16) & 0xFFFF);
+        switch ($entry->getCreatedOS()) {
             case self::MADE_BY_MS_DOS:
             case self::MADE_BY_WINDOWS_NTFS:
-                if ($entry->getPlatform() != self::MADE_BY_MS_DOS ||
-                    ($xattr & 0700) !=
-                    (0400 |
-                        (!($entry->getRawExternalAttributes() & 1) << 7) |
-                        (($entry->getRawExternalAttributes() & 0x10) << 2))
+                if ($entry->getCreatedOS() !== self::MADE_BY_MS_DOS ||
+                    ($xattr & self::UNX_IRWXU) !==
+                    (self::UNX_IRUSR |
+                        (!($externalAttributes & 1) << 7) |
+                        (($externalAttributes & 0x10) << 2))
                 ) {
-                    $xattr = $entry->getRawExternalAttributes() & 0xFF;
-                    $attribs = ".r.-...     ";
-                    $attribs[2] = ($xattr & 0x01) ? '-' : 'w';
-                    $attribs[5] = ($xattr & 0x02) ? 'h' : '-';
-                    $attribs[6] = ($xattr & 0x04) ? 's' : '-';
-                    $attribs[4] = ($xattr & 0x20) ? 'a' : '-';
+                    $xattr = $externalAttributes & 0xFF;
+                    $attributes = '.r.-...     ';
+                    $attributes[2] = ($xattr & 0x01) ? '-' : 'w';
+                    $attributes[5] = ($xattr & 0x02) ? 'h' : '-';
+                    $attributes[6] = ($xattr & 0x04) ? 's' : '-';
+                    $attributes[4] = ($xattr & 0x20) ? 'a' : '-';
+
                     if ($xattr & 0x10) {
-                        $attribs[0] = 'd';
-                        $attribs[3] = 'x';
-                    } else
-                        $attribs[0] = '-';
-                    if ($xattr & 0x08)
-                        $attribs[0] = 'V';
-                    else {
-                        $ext = strtolower(pathinfo($entry->getName(), PATHINFO_EXTENSION));
-                        if (in_array($ext, ["com", "exe", "btm", "cmd", "bat"])) {
-                            $attribs[3] = 'x';
+                        $attributes[0] = 'd';
+                        $attributes[3] = 'x';
+                    } else {
+                        $attributes[0] = '-';
+                    }
+
+                    if ($xattr & 0x08) {
+                        $attributes[0] = 'V';
+                    } else {
+                        $ext = strtolower(pathinfo($entry->getName(), \PATHINFO_EXTENSION));
+
+                        if (\in_array($ext, ['com', 'exe', 'btm', 'cmd', 'bat'])) {
+                            $attributes[3] = 'x';
                         }
                     }
                     break;
-                } /* else: fall through! */
+                } // else: fall through!
 
-            default: /* assume Unix-like */
+            // no break
+            default: // assume Unix-like
                 switch ($xattr & self::UNX_IFMT) {
                     case self::UNX_IFDIR:
-                        $attribs[0] = 'd';
+                        $attributes[0] = 'd';
                         break;
+
                     case self::UNX_IFREG:
-                        $attribs[0] = '-';
+                        $attributes[0] = '-';
                         break;
+
                     case self::UNX_IFLNK:
-                        $attribs[0] = 'l';
+                        $attributes[0] = 'l';
                         break;
+
                     case self::UNX_IFBLK:
-                        $attribs[0] = 'b';
+                        $attributes[0] = 'b';
                         break;
+
                     case self::UNX_IFCHR:
-                        $attribs[0] = 'c';
+                        $attributes[0] = 'c';
                         break;
+
                     case self::UNX_IFIFO:
-                        $attribs[0] = 'p';
+                        $attributes[0] = 'p';
                         break;
+
                     case self::UNX_IFSOCK:
-                        $attribs[0] = 's';
+                        $attributes[0] = 's';
                         break;
                     default:
-                        $attribs[0] = '?';
+                        $attributes[0] = '?';
                         break;
                 }
-                $attribs[1] = ($xattr & self::UNX_IRUSR) ? 'r' : '-';
-                $attribs[4] = ($xattr & self::UNX_IRGRP) ? 'r' : '-';
-                $attribs[7] = ($xattr & self::UNX_IROTH) ? 'r' : '-';
-                $attribs[2] = ($xattr & self::UNX_IWUSR) ? 'w' : '-';
-                $attribs[5] = ($xattr & self::UNX_IWGRP) ? 'w' : '-';
-                $attribs[8] = ($xattr & self::UNX_IWOTH) ? 'w' : '-';
+                $attributes[1] = ($xattr & self::UNX_IRUSR) ? 'r' : '-';
+                $attributes[4] = ($xattr & self::UNX_IRGRP) ? 'r' : '-';
+                $attributes[7] = ($xattr & self::UNX_IROTH) ? 'r' : '-';
+                $attributes[2] = ($xattr & self::UNX_IWUSR) ? 'w' : '-';
+                $attributes[5] = ($xattr & self::UNX_IWGRP) ? 'w' : '-';
+                $attributes[8] = ($xattr & self::UNX_IWOTH) ? 'w' : '-';
 
-                if ($xattr & self::UNX_IXUSR)
-                    $attribs[3] = ($xattr & self::UNX_ISUID) ? 's' : 'x';
-                else
-                    $attribs[3] = ($xattr & self::UNX_ISUID) ? 'S' : '-';  /* S==undefined */
-                if ($xattr & self::UNX_IXGRP)
-                    $attribs[6] = ($xattr & self::UNX_ISGID) ? 's' : 'x';  /* == UNX_ENFMT */
-                else
-                    $attribs[6] = ($xattr & self::UNX_ISGID) ? 'S' : '-';  /* SunOS 4.1.x */
-                if ($xattr & self::UNX_IXOTH)
-                    $attribs[9] = ($xattr & self::UNX_ISVTX) ? 't' : 'x';  /* "sticky bit" */
-                else
-                    $attribs[9] = ($xattr & self::UNX_ISVTX) ? 'T' : '-';  /* T==undefined */
+                if ($xattr & self::UNX_IXUSR) {
+                    $attributes[3] = ($xattr & self::UNX_ISUID) ? 's' : 'x';
+                } else {
+                    $attributes[3] = ($xattr & self::UNX_ISUID) ? 'S' : '-';
+                }  // S==undefined
+                if ($xattr & self::UNX_IXGRP) {
+                    $attributes[6] = ($xattr & self::UNX_ISGID) ? 's' : 'x';
+                }  // == UNX_ENFMT
+                else {
+                    $attributes[6] = ($xattr & self::UNX_ISGID) ? 'S' : '-';
+                }  // SunOS 4.1.x
+                if ($xattr & self::UNX_IXOTH) {
+                    $attributes[9] = ($xattr & self::UNX_ISVTX) ? 't' : 'x';
+                }  // "sticky bit"
+                else {
+                    $attributes[9] = ($xattr & self::UNX_ISVTX) ? 'T' : '-';
+                }  // T==undefined
         }
-        $this->attributes = trim($attribs);
+        $this->attributes = trim($attributes);
     }
 
     /**
      * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     *
+     * @return int
+     */
+    private static function getMethodId(ZipEntry $entry)
+    {
+        $method = $entry->getMethod();
+
+        if ($entry->isEncrypted() && $entry->getMethod() === ZipEntry::METHOD_WINZIP_AES) {
+            $field = $entry->getExtraFieldsCollection()->get(WinZipAesEntryExtraField::getHeaderId());
+
+            if ($field !== null) {
+                /** @var WinZipAesEntryExtraField $field */
+                $method = $field->getMethod();
+            }
+        }
+
+        return $method;
+    }
+
+    /**
+     * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     *
      * @return string
      */
-    public static function getMethodName(ZipEntry $entry)
+    private static function getEntryMethodName(ZipEntry $entry)
     {
         $return = '';
+
+        $compressionMethod = $entry->getMethod();
+
         if ($entry->isEncrypted()) {
-            if ($entry->getMethod() === ZipEntry::WINZIP_AES) {
-                $field = $entry->getExtraField(WinZipAesEntryExtraField::getHeaderId());
-                $return = ucfirst(self::$valuesCompressionMethod[$entry->getMethod()]);
+            if ($entry->getMethod() === ZipEntry::METHOD_WINZIP_AES) {
+                $return .= ucfirst(self::$compressionMethodNames[$entry->getMethod()]);
+                /** @var WinZipAesEntryExtraField|null $field */
+                $field = $entry->getExtraFieldsCollection()->get(WinZipAesEntryExtraField::getHeaderId());
+
                 if ($field !== null) {
-                    /**
-                     * @var WinZipAesEntryExtraField $field
-                     */
                     $return .= '-' . $field->getKeyStrength();
-                    if (isset(self::$valuesCompressionMethod[$field->getMethod()])) {
-                        $return .= ' ' . ucfirst(self::$valuesCompressionMethod[$field->getMethod()]);
-                    }
+                    $compressionMethod = $field->getMethod();
                 }
             } else {
                 $return .= 'ZipCrypto';
-                if (isset(self::$valuesCompressionMethod[$entry->getMethod()])) {
-                    $return .= ' ' . ucfirst(self::$valuesCompressionMethod[$entry->getMethod()]);
-                }
             }
-        } elseif (isset(self::$valuesCompressionMethod[$entry->getMethod()])) {
-            $return = ucfirst(self::$valuesCompressionMethod[$entry->getMethod()]);
-        } else {
-            $return = 'unknown';
+
+            $return .= ' ';
         }
+
+        if (isset(self::$compressionMethodNames[$compressionMethod])) {
+            $return .= ucfirst(self::$compressionMethodNames[$compressionMethod]);
+        } else {
+            $return .= 'unknown';
+        }
+
         return $return;
     }
 
     /**
      * @param ZipEntry $entry
+     *
      * @return string
      */
     public static function getPlatformName(ZipEntry $entry)
     {
-        if (isset(self::$valuesMadeBy[$entry->getPlatform()])) {
-            return self::$valuesMadeBy[$entry->getPlatform()];
-        } else {
-            return 'unknown';
+        if (isset(self::$platformNames[$entry->getCreatedOS()])) {
+            return self::$platformNames[$entry->getCreatedOS()];
         }
-    }
 
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            'path' => $this->getPath(),
-            'folder' => $this->isFolder(),
-            'size' => $this->getSize(),
-            'compressed_size' => $this->getCompressedSize(),
-            'modified' => $this->getMtime(),
-            'created' => $this->getCtime(),
-            'accessed' => $this->getAtime(),
-            'attributes' => $this->getAttributes(),
-            'encrypted' => $this->isEncrypted(),
-            'comment' => $this->getComment(),
-            'crc' => $this->getCrc(),
-            'method' => $this->getMethod(),
-            'platform' => $this->getPlatform(),
-            'version' => $this->getVersion()
-        ];
+        return 'unknown';
     }
 
     /**
      * @return string
      */
-    public function getPath()
+    public function getName()
     {
-        return $this->path;
+        return $this->name;
     }
 
     /**
-     * @return boolean
+     * @return string
+     *
+     * @deprecated use \PhpZip\Model\ZipInfo::getName()
+     */
+    public function getPath()
+    {
+        return $this->getName();
+    }
+
+    /**
+     * @return bool
      */
     public function isFolder()
     {
@@ -424,7 +493,15 @@ class ZipInfo
     }
 
     /**
-     * @return boolean
+     * @return string
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * @return bool
      */
     public function isEncrypted()
     {
@@ -432,7 +509,7 @@ class ZipInfo
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getComment()
     {
@@ -449,10 +526,20 @@ class ZipInfo
 
     /**
      * @return string
+     *
+     * @deprecated use \PhpZip\Model\ZipInfo::getMethodName()
      */
     public function getMethod()
     {
-        return $this->method;
+        return $this->getMethodName();
+    }
+
+    /**
+     * @return string
+     */
+    public function getMethodName()
+    {
+        return $this->methodName;
     }
 
     /**
@@ -472,35 +559,76 @@ class ZipInfo
     }
 
     /**
-     * @return string
+     * @return int|null
      */
-    public function getAttributes()
+    public function getEncryptionMethod()
     {
-        return $this->attributes;
+        return $this->encryptionMethod;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getCompressionLevel()
+    {
+        return $this->compressionLevel;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompressionMethod()
+    {
+        return $this->compressionMethod;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        return [
+            'name' => $this->getName(),
+            'path' => $this->getName(), // deprecated
+            'folder' => $this->isFolder(),
+            'size' => $this->getSize(),
+            'compressed_size' => $this->getCompressedSize(),
+            'modified' => $this->getMtime(),
+            'created' => $this->getCtime(),
+            'accessed' => $this->getAtime(),
+            'attributes' => $this->getAttributes(),
+            'encrypted' => $this->isEncrypted(),
+            'encryption_method' => $this->getEncryptionMethod(),
+            'comment' => $this->getComment(),
+            'crc' => $this->getCrc(),
+            'method' => $this->getMethodName(), // deprecated
+            'method_name' => $this->getMethodName(),
+            'compression_method' => $this->getCompressionMethod(),
+            'platform' => $this->getPlatform(),
+            'version' => $this->getVersion(),
+        ];
     }
 
     /**
      * @return string
      */
-    function __toString()
+    public function __toString()
     {
-        return 'ZipInfo {'
-        . 'Path="' . $this->getPath() . '", '
-        . ($this->isFolder() ? 'Folder, ' : '')
-        . 'Size=' . FilesUtil::humanSize($this->getSize())
-        . ', Compressed size=' . FilesUtil::humanSize($this->getCompressedSize())
-        . ', Modified time=' . date(DATE_W3C, $this->getMtime()) . ', '
-        . ($this->getCtime() !== null ? 'Created time=' . date(DATE_W3C, $this->getCtime()) . ', ' : '')
-        . ($this->getAtime() !== null ? 'Accessed time=' . date(DATE_W3C, $this->getAtime()) . ', ' : '')
-        . ($this->isEncrypted() ? 'Encrypted, ' : '')
-        . (!empty($this->comment) ? 'Comment="' . $this->getComment() . '", ' : '')
-        . (!empty($this->crc) ? 'Crc=0x' . dechex($this->getCrc()) . ', ' : '')
-        . 'Method="' . $this->getMethod() . '", '
-        . 'Attributes="' . $this->getAttributes() . '", '
-        . 'Platform="' . $this->getPlatform() . '", '
-        . 'Version=' . $this->getVersion()
-        . '}';
+        return __CLASS__ . ' {'
+            . 'Name="' . $this->getName() . '", '
+            . ($this->isFolder() ? 'Folder, ' : '')
+            . 'Size="' . FilesUtil::humanSize($this->getSize()) . '"'
+            . ', Compressed size="' . FilesUtil::humanSize($this->getCompressedSize()) . '"'
+            . ', Modified time="' . date(\DATE_W3C, $this->getMtime()) . '", '
+            . ($this->getCtime() !== null ? 'Created time="' . date(\DATE_W3C, $this->getCtime()) . '", ' : '')
+            . ($this->getAtime() !== null ? 'Accessed time="' . date(\DATE_W3C, $this->getAtime()) . '", ' : '')
+            . ($this->isEncrypted() ? 'Encrypted, ' : '')
+            . (!empty($this->comment) ? 'Comment="' . $this->getComment() . '", ' : '')
+            . (!empty($this->crc) ? 'Crc=0x' . dechex($this->getCrc()) . ', ' : '')
+            . 'Method name="' . $this->getMethodName() . '", '
+            . 'Attributes="' . $this->getAttributes() . '", '
+            . 'Platform="' . $this->getPlatform() . '", '
+            . 'Version=' . $this->getVersion()
+            . '}';
     }
-
-
-}
+}

src/PhpZip/Model/ZipModel.php

@@ -0,0 +1,367 @@
+<?php
+
+namespace PhpZip\Model;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\ZipEntryNotFoundException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Model\Entry\ZipChangesEntry;
+use PhpZip\Model\Entry\ZipSourceEntry;
+use PhpZip\ZipFile;
+
+/**
+ * Zip Model.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipModel implements \Countable
+{
+    /** @var ZipSourceEntry[] */
+    protected $inputEntries = [];
+
+    /** @var ZipEntry[] */
+    protected $outEntries = [];
+
+    /** @var string|null */
+    protected $archiveComment;
+
+    /** @var string|null */
+    protected $archiveCommentChanges;
+
+    /** @var bool */
+    protected $archiveCommentChanged = false;
+
+    /** @var int|null */
+    protected $zipAlign;
+
+    /** @var bool */
+    private $zip64;
+
+    /**
+     * @param ZipSourceEntry[]      $entries
+     * @param EndOfCentralDirectory $endOfCentralDirectory
+     *
+     * @return ZipModel
+     */
+    public static function newSourceModel(array $entries, EndOfCentralDirectory $endOfCentralDirectory)
+    {
+        $model = new self();
+        $model->inputEntries = $entries;
+        $model->outEntries = $entries;
+        $model->archiveComment = $endOfCentralDirectory->getComment();
+        $model->zip64 = $endOfCentralDirectory->isZip64();
+
+        return $model;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getArchiveComment()
+    {
+        if ($this->archiveCommentChanged) {
+            return $this->archiveCommentChanges;
+        }
+
+        return $this->archiveComment;
+    }
+
+    /**
+     * @param string $comment
+     */
+    public function setArchiveComment($comment)
+    {
+        if ($comment !== null && $comment !== '') {
+            $comment = (string) $comment;
+            $length = \strlen($comment);
+
+            if ($length > 0xffff) {
+                throw new InvalidArgumentException('Length comment out of range');
+            }
+        }
+
+        if ($comment !== $this->archiveComment) {
+            $this->archiveCommentChanges = $comment;
+            $this->archiveCommentChanged = true;
+        } else {
+            $this->archiveCommentChanged = false;
+        }
+    }
+
+    /**
+     * Specify a password for extracting files.
+     *
+     * @param string|null $password
+     *
+     * @throws ZipException
+     */
+    public function setReadPassword($password)
+    {
+        foreach ($this->inputEntries as $entry) {
+            if ($entry->isEncrypted()) {
+                $entry->setPassword($password);
+            }
+        }
+    }
+
+    /**
+     * @param string $entryName
+     * @param string $password
+     *
+     * @throws ZipEntryNotFoundException
+     * @throws ZipException
+     */
+    public function setReadPasswordEntry($entryName, $password)
+    {
+        if (!isset($this->inputEntries[$entryName])) {
+            throw new ZipEntryNotFoundException($entryName);
+        }
+
+        if ($this->inputEntries[$entryName]->isEncrypted()) {
+            $this->inputEntries[$entryName]->setPassword($password);
+        }
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getZipAlign()
+    {
+        return $this->zipAlign;
+    }
+
+    /**
+     * @param int|null $zipAlign
+     */
+    public function setZipAlign($zipAlign)
+    {
+        $this->zipAlign = $zipAlign === null ? null : (int) $zipAlign;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isZipAlign()
+    {
+        return $this->zipAlign !== null;
+    }
+
+    /**
+     * @param string|null $writePassword
+     */
+    public function setWritePassword($writePassword)
+    {
+        $this->matcher()->all()->setPassword($writePassword);
+    }
+
+    /**
+     * Remove password.
+     */
+    public function removePassword()
+    {
+        $this->matcher()->all()->setPassword(null);
+    }
+
+    /**
+     * @param string|ZipEntry $entryName
+     */
+    public function removePasswordEntry($entryName)
+    {
+        $this->matcher()->add($entryName)->setPassword(null);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isArchiveCommentChanged()
+    {
+        return $this->archiveCommentChanged;
+    }
+
+    /**
+     * @param string|ZipEntry $old
+     * @param string|ZipEntry $new
+     *
+     * @throws ZipException
+     */
+    public function renameEntry($old, $new)
+    {
+        $old = $old instanceof ZipEntry ? $old->getName() : (string) $old;
+        $new = $new instanceof ZipEntry ? $new->getName() : (string) $new;
+
+        if (isset($this->outEntries[$new])) {
+            throw new InvalidArgumentException('New entry name ' . $new . ' is exists.');
+        }
+
+        $entry = $this->getEntryForChanges($old);
+        $entry->setName($new);
+        $this->deleteEntry($old);
+        $this->addEntry($entry);
+    }
+
+    /**
+     * @param string|ZipEntry $entry
+     *
+     * @throws ZipEntryNotFoundException
+     * @throws ZipException
+     *
+     * @return ZipChangesEntry|ZipEntry
+     */
+    public function getEntryForChanges($entry)
+    {
+        $entry = $this->getEntry($entry);
+
+        if ($entry instanceof ZipSourceEntry) {
+            $entry = new ZipChangesEntry($entry);
+            $this->addEntry($entry);
+        }
+
+        return $entry;
+    }
+
+    /**
+     * @param string|ZipEntry $entryName
+     *
+     * @throws ZipEntryNotFoundException
+     *
+     * @return ZipEntry
+     */
+    public function getEntry($entryName)
+    {
+        $entryName = $entryName instanceof ZipEntry ? $entryName->getName() : (string) $entryName;
+
+        if (isset($this->outEntries[$entryName])) {
+            return $this->outEntries[$entryName];
+        }
+
+        throw new ZipEntryNotFoundException($entryName);
+    }
+
+    /**
+     * @param string|ZipEntry $entry
+     *
+     * @return bool
+     */
+    public function deleteEntry($entry)
+    {
+        $entry = $entry instanceof ZipEntry ? $entry->getName() : (string) $entry;
+
+        if (isset($this->outEntries[$entry])) {
+            unset($this->outEntries[$entry]);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param ZipEntry $entry
+     */
+    public function addEntry(ZipEntry $entry)
+    {
+        $this->outEntries[$entry->getName()] = $entry;
+    }
+
+    /**
+     * Get all entries with changes.
+     *
+     * @return ZipEntry[]
+     */
+    public function &getEntries()
+    {
+        return $this->outEntries;
+    }
+
+    /**
+     * @param string|ZipEntry $entryName
+     *
+     * @return bool
+     */
+    public function hasEntry($entryName)
+    {
+        $entryName = $entryName instanceof ZipEntry ? $entryName->getName() : (string) $entryName;
+
+        return isset($this->outEntries[$entryName]);
+    }
+
+    /**
+     * Delete all entries.
+     */
+    public function deleteAll()
+    {
+        $this->outEntries = [];
+    }
+
+    /**
+     * Count elements of an object.
+     *
+     * @see http://php.net/manual/en/countable.count.php
+     *
+     * @return int The custom count as an integer.
+     *             </p>
+     *             <p>
+     *             The return value is cast to an integer.
+     *
+     * @since 5.1.0
+     */
+    public function count()
+    {
+        return \count($this->outEntries);
+    }
+
+    /**
+     * Undo all changes done in the archive.
+     */
+    public function unchangeAll()
+    {
+        $this->outEntries = $this->inputEntries;
+        $this->unchangeArchiveComment();
+    }
+
+    /**
+     * Undo change archive comment.
+     */
+    public function unchangeArchiveComment()
+    {
+        $this->archiveCommentChanges = null;
+        $this->archiveCommentChanged = false;
+    }
+
+    /**
+     * Revert all changes done to an entry with the given name.
+     *
+     * @param string|ZipEntry $entry Entry name or ZipEntry
+     *
+     * @return bool
+     */
+    public function unchangeEntry($entry)
+    {
+        $entry = $entry instanceof ZipEntry ? $entry->getName() : (string) $entry;
+
+        if (isset($this->outEntries[$entry], $this->inputEntries[$entry])) {
+            $this->outEntries[$entry] = $this->inputEntries[$entry];
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param int $encryptionMethod
+     */
+    public function setEncryptionMethod($encryptionMethod = ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256)
+    {
+        $this->matcher()->all()->setEncryptionMethod($encryptionMethod);
+    }
+
+    /**
+     * @return ZipEntryMatcher
+     */
+    public function matcher()
+    {
+        return new ZipEntryMatcher($this);
+    }
+}

src/PhpZip/Output/ZipOutputEmptyDirEntry.php

@@ -1,22 +0,0 @@
-<?php
-namespace PhpZip\Output;
-
-/**
- * Zip output entry for empty dir.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class ZipOutputEmptyDirEntry extends ZipOutputEntry
-{
-
-    /**
-     * Returns entry data.
-     *
-     * @return string
-     */
-    public function getEntryContent()
-    {
-        return '';
-    }
-}

src/PhpZip/Output/ZipOutputEntry.php

@@ -1,46 +0,0 @@
-<?php
-namespace PhpZip\Output;
-
-use PhpZip\Model\ZipEntry;
-
-/**
- * Zip output Entry
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-abstract class ZipOutputEntry
-{
-    /**
-     * @var ZipEntry
-     */
-    private $entry;
-
-    /**
-     * @param ZipEntry $entry
-     */
-    public function __construct(ZipEntry $entry)
-    {
-        if ($entry === null) {
-            throw new \RuntimeException('entry is null');
-        }
-        $this->entry = $entry;
-    }
-
-    /**
-     * Returns zip entry
-     *
-     * @return ZipEntry
-     */
-    public function getEntry()
-    {
-        return $this->entry;
-    }
-
-    /**
-     * Returns entry data.
-     *
-     * @return string
-     */
-    abstract public function getEntryContent();
-}

src/PhpZip/Output/ZipOutputStreamEntry.php

@@ -1,54 +0,0 @@
-<?php
-namespace PhpZip\Output;
-
-use PhpZip\Model\ZipEntry;
-use RuntimeException;
-
-/**
- * Zip output entry for stream resource.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class ZipOutputStreamEntry extends ZipOutputEntry
-{
-    /**
-     * @var resource
-     */
-    private $stream;
-
-    /**
-     * @param resource $stream
-     * @param ZipEntry $entry
-     */
-    public function __construct($stream, ZipEntry $entry)
-    {
-        parent::__construct($entry);
-        if (!is_resource($stream)) {
-            throw new RuntimeException('stream is not resource');
-        }
-        $this->stream = $stream;
-    }
-
-    /**
-     * Returns entry data.
-     *
-     * @return string
-     */
-    public function getEntryContent()
-    {
-        rewind($this->stream);
-        return stream_get_contents($this->stream);
-    }
-
-    /**
-     * Release stream resource.
-     */
-    function __destruct()
-    {
-        if ($this->stream !== null) {
-            fclose($this->stream);
-            $this->stream = null;
-        }
-    }
-}

src/PhpZip/Output/ZipOutputStringEntry.php

@@ -1,46 +0,0 @@
-<?php
-namespace PhpZip\Output;
-
-use PhpZip\Exception\ZipException;
-use PhpZip\Model\ZipEntry;
-
-/**
- * Zip output entry for string data.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class ZipOutputStringEntry extends ZipOutputEntry
-{
-    /**
-     * Data content.
-     *
-     * @var string
-     */
-    private $data;
-
-    /**
-     * @param string $data
-     * @param ZipEntry $entry
-     * @throws ZipException If data empty.
-     */
-    public function __construct($data, ZipEntry $entry)
-    {
-        parent::__construct($entry);
-        $data = (string)$data;
-        if ($data === null) {
-            throw new ZipException("data is null");
-        }
-        $this->data = $data;
-    }
-
-    /**
-     * Returns entry data.
-     *
-     * @return string
-     */
-    public function getEntryContent()
-    {
-        return $this->data;
-    }
-}

src/PhpZip/Output/ZipOutputZipFileEntry.php

@@ -1,56 +0,0 @@
-<?php
-namespace PhpZip\Output;
-
-use PhpZip\Exception\ZipException;
-use PhpZip\Model\ZipEntry;
-use PhpZip\ZipFile;
-
-/**
- * Zip output entry for input zip file.
- *
- * @author Ne-Lexa alexey@nelexa.ru
- * @license MIT
- */
-class ZipOutputZipFileEntry extends ZipOutputEntry
-{
-    /**
-     * Input zip file.
-     *
-     * @var ZipFile
-     */
-    private $inputZipFile;
-
-    /**
-     * Input entry name.
-     *
-     * @var string
-     */
-    private $inputEntryName;
-
-    /**
-     * ZipOutputZipFileEntry constructor.
-     * @param ZipFile $zipFile
-     * @param ZipEntry $zipEntry
-     * @throws ZipException If input zip file is null.
-     */
-    public function __construct(ZipFile $zipFile, ZipEntry $zipEntry)
-    {
-        if ($zipFile === null) {
-            throw new ZipException('ZipFile is null');
-        }
-        parent::__construct(clone $zipEntry);
-
-        $this->inputZipFile = $zipFile;
-        $this->inputEntryName = $zipEntry->getName();
-    }
-
-    /**
-     * Returns entry data.
-     *
-     * @return string
-     */
-    public function getEntryContent()
-    {
-        return $this->inputZipFile->getEntryContent($this->inputEntryName);
-    }
-}

src/PhpZip/Stream/ResponseStream.php

@@ -0,0 +1,334 @@
+<?php
+
+namespace PhpZip\Stream;
+
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Implement PSR Message Stream.
+ */
+class ResponseStream implements StreamInterface
+{
+    /** @var array */
+    private static $readWriteHash = [
+        'read' => [
+            'r' => true,
+            'w+' => true,
+            'r+' => true,
+            'x+' => true,
+            'c+' => true,
+            'rb' => true,
+            'w+b' => true,
+            'r+b' => true,
+            'x+b' => true,
+            'c+b' => true,
+            'rt' => true,
+            'w+t' => true,
+            'r+t' => true,
+            'x+t' => true,
+            'c+t' => true,
+            'a+' => true,
+        ],
+        'write' => [
+            'w' => true,
+            'w+' => true,
+            'rw' => true,
+            'r+' => true,
+            'x+' => true,
+            'c+' => true,
+            'wb' => true,
+            'w+b' => true,
+            'r+b' => true,
+            'x+b' => true,
+            'c+b' => true,
+            'w+t' => true,
+            'r+t' => true,
+            'x+t' => true,
+            'c+t' => true,
+            'a' => true,
+            'a+' => true,
+        ],
+    ];
+
+    /** @var resource */
+    private $stream;
+
+    /** @var int */
+    private $size;
+
+    /** @var bool */
+    private $seekable;
+
+    /** @var bool */
+    private $readable;
+
+    /** @var bool */
+    private $writable;
+
+    /** @var array|mixed|null */
+    private $uri;
+
+    /**
+     * @param resource $stream stream resource to wrap
+     *
+     * @throws \InvalidArgumentException if the stream is not a stream resource
+     */
+    public function __construct($stream)
+    {
+        if (!\is_resource($stream)) {
+            throw new \InvalidArgumentException('Stream must be a resource');
+        }
+        $this->stream = $stream;
+        $meta = stream_get_meta_data($this->stream);
+        $this->seekable = $meta['seekable'];
+        $this->readable = isset(self::$readWriteHash['read'][$meta['mode']]);
+        $this->writable = isset(self::$readWriteHash['write'][$meta['mode']]);
+        $this->uri = $this->getMetadata('uri');
+    }
+
+    /**
+     * Get stream metadata as an associative array or retrieve a specific key.
+     *
+     * The keys returned are identical to the keys returned from PHP's
+     * stream_get_meta_data() function.
+     *
+     * @see http://php.net/manual/en/function.stream-get-meta-data.php
+     *
+     * @param string $key specific metadata to retrieve
+     *
+     * @return array|mixed|null Returns an associative array if no key is
+     *                          provided. Returns a specific key value if a key is provided and the
+     *                          value is found, or null if the key is not found.
+     */
+    public function getMetadata($key = null)
+    {
+        if (!$this->stream) {
+            return $key ? null : [];
+        }
+        $meta = stream_get_meta_data($this->stream);
+
+        return isset($meta[$key]) ? $meta[$key] : null;
+    }
+
+    /**
+     * Reads all data from the stream into a string, from the beginning to end.
+     *
+     * This method MUST attempt to seek to the beginning of the stream before
+     * reading data and read the stream until the end is reached.
+     *
+     * Warning: This could attempt to load a large amount of data into memory.
+     *
+     * This method MUST NOT raise an exception in order to conform with PHP's
+     * string casting operations.
+     *
+     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        if (!$this->stream) {
+            return '';
+        }
+        $this->rewind();
+
+        return (string) stream_get_contents($this->stream);
+    }
+
+    /**
+     * Seek to the beginning of the stream.
+     *
+     * If the stream is not seekable, this method will raise an exception;
+     * otherwise, it will perform a seek(0).
+     *
+     * @throws \RuntimeException on failure
+     *
+     * @see http://www.php.net/manual/en/function.fseek.php
+     * @see seek()
+     */
+    public function rewind()
+    {
+        $this->seekable && rewind($this->stream);
+    }
+
+    /**
+     * Get the size of the stream if known.
+     *
+     * @return int|null returns the size in bytes if known, or null if unknown
+     */
+    public function getSize()
+    {
+        if ($this->size !== null) {
+            return $this->size;
+        }
+
+        if (!$this->stream) {
+            return null;
+        }
+        // Clear the stat cache if the stream has a URI
+        if ($this->uri) {
+            clearstatcache(true, $this->uri);
+        }
+        $stats = fstat($this->stream);
+
+        if (isset($stats['size'])) {
+            $this->size = $stats['size'];
+
+            return $this->size;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the current position of the file read/write pointer.
+     *
+     * @throws \RuntimeException on error
+     *
+     * @return int Position of the file pointer
+     */
+    public function tell()
+    {
+        return $this->stream ? ftell($this->stream) : false;
+    }
+
+    /**
+     * Returns true if the stream is at the end of the stream.
+     *
+     * @return bool
+     */
+    public function eof()
+    {
+        return !$this->stream || feof($this->stream);
+    }
+
+    /**
+     * Returns whether or not the stream is seekable.
+     *
+     * @return bool
+     */
+    public function isSeekable()
+    {
+        return $this->seekable;
+    }
+
+    /**
+     * Seek to a position in the stream.
+     *
+     * @see http://www.php.net/manual/en/function.fseek.php
+     *
+     * @param int $offset Stream offset
+     * @param int $whence Specifies how the cursor position will be calculated
+     *                    based on the seek offset. Valid values are identical to the built-in
+     *                    PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
+     *                    offset bytes SEEK_CUR: Set position to current location plus offset
+     *                    SEEK_END: Set position to end-of-stream plus offset.
+     *
+     * @throws \RuntimeException on failure
+     */
+    public function seek($offset, $whence = \SEEK_SET)
+    {
+        $this->seekable && fseek($this->stream, $offset, $whence);
+    }
+
+    /**
+     * Returns whether or not the stream is writable.
+     *
+     * @return bool
+     */
+    public function isWritable()
+    {
+        return $this->writable;
+    }
+
+    /**
+     * Write data to the stream.
+     *
+     * @param string $string the string that is to be written
+     *
+     * @throws \RuntimeException on failure
+     *
+     * @return int returns the number of bytes written to the stream
+     */
+    public function write($string)
+    {
+        $this->size = null;
+
+        return $this->writable ? fwrite($this->stream, $string) : false;
+    }
+
+    /**
+     * Returns whether or not the stream is readable.
+     *
+     * @return bool
+     */
+    public function isReadable()
+    {
+        return $this->readable;
+    }
+
+    /**
+     * Read data from the stream.
+     *
+     * @param int $length Read up to $length bytes from the object and return
+     *                    them. Fewer than $length bytes may be returned if underlying stream
+     *                    call returns fewer bytes.
+     *
+     * @throws \RuntimeException if an error occurs
+     *
+     * @return string returns the data read from the stream, or an empty string
+     *                if no bytes are available
+     */
+    public function read($length)
+    {
+        return $this->readable ? fread($this->stream, $length) : '';
+    }
+
+    /**
+     * Returns the remaining contents in a string.
+     *
+     * @throws \RuntimeException if unable to read or an error occurs while
+     *                           reading
+     *
+     * @return string
+     */
+    public function getContents()
+    {
+        return $this->stream ? stream_get_contents($this->stream) : '';
+    }
+
+    /**
+     * Closes the stream when the destructed.
+     */
+    public function __destruct()
+    {
+        $this->close();
+    }
+
+    /**
+     * Closes the stream and any underlying resources.
+     */
+    public function close()
+    {
+        if (\is_resource($this->stream)) {
+            fclose($this->stream);
+        }
+        $this->detach();
+    }
+
+    /**
+     * Separates any underlying resources from the stream.
+     *
+     * After the stream has been detached, the stream is in an unusable state.
+     *
+     * @return resource|null Underlying PHP stream, if any
+     */
+    public function detach()
+    {
+        $result = $this->stream;
+        $this->stream = $this->size = $this->uri = null;
+        $this->readable = $this->writable = $this->seekable = false;
+
+        return $result;
+    }
+}

src/PhpZip/Stream/ZipInputStream.php

@@ -0,0 +1,718 @@
+<?php
+
+namespace PhpZip\Stream;
+
+use PhpZip\Crypto\TraditionalPkwareEncryptionEngine;
+use PhpZip\Crypto\WinZipAesEngine;
+use PhpZip\Exception\Crc32Exception;
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\RuntimeException;
+use PhpZip\Exception\ZipAuthenticationException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Exception\ZipUnsupportMethodException;
+use PhpZip\Extra\ExtraFieldsCollection;
+use PhpZip\Extra\ExtraFieldsFactory;
+use PhpZip\Extra\Fields\ApkAlignmentExtraField;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
+use PhpZip\Model\EndOfCentralDirectory;
+use PhpZip\Model\Entry\ZipSourceEntry;
+use PhpZip\Model\ZipEntry;
+use PhpZip\Model\ZipModel;
+use PhpZip\Util\PackUtil;
+use PhpZip\Util\StringUtil;
+use PhpZip\ZipFile;
+
+/**
+ * Read zip file.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipInputStream implements ZipInputStreamInterface
+{
+    /** @var resource */
+    protected $in;
+
+    /** @var ZipModel */
+    protected $zipModel;
+
+    /**
+     * ZipInputStream constructor.
+     *
+     * @param resource $in
+     */
+    public function __construct($in)
+    {
+        if (!\is_resource($in)) {
+            throw new RuntimeException('$in must be resource');
+        }
+        $this->in = $in;
+    }
+
+    /**
+     * @throws ZipException
+     *
+     * @return ZipModel
+     */
+    public function readZip()
+    {
+        $this->checkZipFileSignature();
+        $endOfCentralDirectory = $this->readEndOfCentralDirectory();
+        $entries = $this->mountCentralDirectory($endOfCentralDirectory);
+        $this->zipModel = ZipModel::newSourceModel($entries, $endOfCentralDirectory);
+
+        return $this->zipModel;
+    }
+
+    /**
+     * Check zip file signature.
+     *
+     * @throws ZipException if this not .ZIP file.
+     */
+    protected function checkZipFileSignature()
+    {
+        rewind($this->in);
+        // Constraint: A ZIP file must start with a Local File Header
+        // or a (ZIP64) End Of Central Directory Record if it's empty.
+        $signatureBytes = fread($this->in, 4);
+
+        if (\strlen($signatureBytes) < 4) {
+            throw new ZipException('Invalid zip file.');
+        }
+        $signature = unpack('V', $signatureBytes)[1];
+
+        if (
+            $signature !== ZipEntry::LOCAL_FILE_HEADER_SIG
+            && $signature !== EndOfCentralDirectory::ZIP64_END_OF_CD_RECORD_SIG
+            && $signature !== EndOfCentralDirectory::END_OF_CD_SIG
+        ) {
+            throw new ZipException(
+                'Expected Local File Header or (ZIP64) End Of Central Directory Record! Signature: ' . $signature
+            );
+        }
+    }
+
+    /**
+     * @throws ZipException
+     *
+     * @return EndOfCentralDirectory
+     */
+    protected function readEndOfCentralDirectory()
+    {
+        if (!$this->findEndOfCentralDirectory()) {
+            throw new ZipException('Invalid zip file. The end of the central directory could not be found.');
+        }
+
+        $positionECD = ftell($this->in) - 4;
+        $buffer = fread($this->in, fstat($this->in)['size'] - $positionECD);
+
+        $unpack = unpack(
+            'vdiskNo/vcdDiskNo/vcdEntriesDisk/' .
+            'vcdEntries/VcdSize/VcdPos/vcommentLength',
+            substr($buffer, 0, 18)
+        );
+
+        if (
+            $unpack['diskNo'] !== 0 ||
+            $unpack['cdDiskNo'] !== 0 ||
+            $unpack['cdEntriesDisk'] !== $unpack['cdEntries']
+        ) {
+            throw new ZipException(
+                'ZIP file spanning/splitting is not supported!'
+            );
+        }
+        // .ZIP file comment       (variable sizeECD)
+        $comment = null;
+
+        if ($unpack['commentLength'] > 0) {
+            $comment = substr($buffer, 18, $unpack['commentLength']);
+        }
+
+        // Check for ZIP64 End Of Central Directory Locator exists.
+        $zip64ECDLocatorPosition = $positionECD - EndOfCentralDirectory::ZIP64_END_OF_CD_LOCATOR_LEN;
+        fseek($this->in, $zip64ECDLocatorPosition);
+        // zip64 end of central dir locator
+        // signature                       4 bytes  (0x07064b50)
+        if ($zip64ECDLocatorPosition > 0 && unpack(
+            'V',
+            fread($this->in, 4)
+        )[1] === EndOfCentralDirectory::ZIP64_END_OF_CD_LOCATOR_SIG) {
+            $positionECD = $this->findZip64ECDPosition();
+            $endCentralDirectory = $this->readZip64EndOfCentralDirectory($positionECD);
+            $endCentralDirectory->setComment($comment);
+        } else {
+            $endCentralDirectory = new EndOfCentralDirectory(
+                $unpack['cdEntries'],
+                $unpack['cdPos'],
+                $unpack['cdSize'],
+                false,
+                $comment
+            );
+        }
+
+        return $endCentralDirectory;
+    }
+
+    /**
+     * @throws ZipException
+     *
+     * @return bool
+     */
+    protected function findEndOfCentralDirectory()
+    {
+        $max = fstat($this->in)['size'] - EndOfCentralDirectory::END_OF_CENTRAL_DIRECTORY_RECORD_MIN_LEN;
+
+        if ($max < 0) {
+            throw new ZipException('Too short to be a zip file');
+        }
+        $min = $max >= 0xffff ? $max - 0xffff : 0;
+        // Search for End of central directory record.
+        for ($position = $max; $position >= $min; $position--) {
+            fseek($this->in, $position);
+            // end of central dir signature    4 bytes  (0x06054b50)
+            if (unpack('V', fread($this->in, 4))[1] !== EndOfCentralDirectory::END_OF_CD_SIG) {
+                continue;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Read Zip64 end of central directory locator and returns
+     * Zip64 end of central directory position.
+     *
+     * number of the disk with the
+     * start of the zip64 end of
+     * central directory               4 bytes
+     * relative offset of the zip64
+     * end of central directory record 8 bytes
+     * total number of disks           4 bytes
+     *
+     * @throws ZipException
+     *
+     * @return int Zip64 End Of Central Directory position
+     */
+    protected function findZip64ECDPosition()
+    {
+        $diskNo = unpack('V', fread($this->in, 4))[1];
+        $zip64ECDPos = PackUtil::unpackLongLE(fread($this->in, 8));
+        $totalDisks = unpack('V', fread($this->in, 4))[1];
+
+        if ($diskNo !== 0 || $totalDisks > 1) {
+            throw new ZipException('ZIP file spanning/splitting is not supported!');
+        }
+
+        return $zip64ECDPos;
+    }
+
+    /**
+     * Read zip64 end of central directory locator and zip64 end
+     * of central directory record.
+     *
+     * zip64 end of central dir
+     * signature                       4 bytes  (0x06064b50)
+     * size of zip64 end of central
+     * directory record                8 bytes
+     * version made by                 2 bytes
+     * version needed to extract       2 bytes
+     * number of this disk             4 bytes
+     * number of the disk with the
+     * start of the central directory  4 bytes
+     * total number of entries in the
+     * central directory on this disk  8 bytes
+     * total number of entries in the
+     * central directory               8 bytes
+     * size of the central directory   8 bytes
+     * offset of start of central
+     * directory with respect to
+     * the starting disk number        8 bytes
+     * zip64 extensible data sector    (variable size)
+     *
+     * @param int $zip64ECDPosition
+     *
+     * @throws ZipException
+     *
+     * @return EndOfCentralDirectory
+     */
+    protected function readZip64EndOfCentralDirectory($zip64ECDPosition)
+    {
+        fseek($this->in, $zip64ECDPosition);
+
+        $buffer = fread($this->in, 56 /* zip64 end of cd rec length */);
+
+        if (unpack('V', $buffer)[1] !== EndOfCentralDirectory::ZIP64_END_OF_CD_RECORD_SIG) {
+            throw new ZipException('Expected ZIP64 End Of Central Directory Record!');
+        }
+
+        $data = unpack(
+            'VdiskNo/VcdDiskNo',
+            substr($buffer, 16)
+        );
+        $cdEntriesDisk = PackUtil::unpackLongLE(substr($buffer, 24, 8));
+        $entryCount = PackUtil::unpackLongLE(substr($buffer, 32, 8));
+        $cdSize = PackUtil::unpackLongLE(substr($buffer, 40, 8));
+        $cdPos = PackUtil::unpackLongLE(substr($buffer, 48, 8));
+
+        if ($data['diskNo'] !== 0 || $data['cdDiskNo'] !== 0 || $entryCount !== $cdEntriesDisk) {
+            throw new ZipException('ZIP file spanning/splitting is not supported!');
+        }
+
+        if ($entryCount < 0 || $entryCount > 0x7fffffff) {
+            throw new ZipException('Total Number Of Entries In The Central Directory out of range!');
+        }
+
+        // skip zip64 extensible data sector (variable sizeEndCD)
+
+        return new EndOfCentralDirectory(
+            $entryCount,
+            $cdPos,
+            $cdSize,
+            true
+        );
+    }
+
+    /**
+     * Reads the central directory from the given seekable byte channel
+     * and populates the internal tables with ZipEntry instances.
+     *
+     * The ZipEntry's will know all data that can be obtained from the
+     * central directory alone, but not the data that requires the local
+     * file header or additional data to be read.
+     *
+     * @param EndOfCentralDirectory $endOfCentralDirectory
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry[]
+     */
+    protected function mountCentralDirectory(EndOfCentralDirectory $endOfCentralDirectory)
+    {
+        $entries = [];
+
+        fseek($this->in, $endOfCentralDirectory->getCdOffset());
+
+        if (!($cdStream = fopen('php://temp', 'w+b'))) {
+            throw new ZipException('Temp resource can not open from write');
+        }
+        stream_copy_to_stream($this->in, $cdStream, $endOfCentralDirectory->getCdSize());
+        rewind($cdStream);
+        for ($numEntries = $endOfCentralDirectory->getEntryCount(); $numEntries > 0; $numEntries--) {
+            $entry = $this->readCentralDirectoryEntry($cdStream);
+            $entries[$entry->getName()] = $entry;
+        }
+        fclose($cdStream);
+
+        return $entries;
+    }
+
+    /**
+     * Read central directory entry.
+     *
+     * central file header signature   4 bytes  (0x02014b50)
+     * version made by                 2 bytes
+     * version needed to extract       2 bytes
+     * general purpose bit flag        2 bytes
+     * compression method              2 bytes
+     * last mod file time              2 bytes
+     * last mod file date              2 bytes
+     * crc-32                          4 bytes
+     * compressed size                 4 bytes
+     * uncompressed size               4 bytes
+     * file name length                2 bytes
+     * extra field length              2 bytes
+     * file comment length             2 bytes
+     * disk number start               2 bytes
+     * internal file attributes        2 bytes
+     * external file attributes        4 bytes
+     * relative offset of local header 4 bytes
+     *
+     * file name (variable size)
+     * extra field (variable size)
+     * file comment (variable size)
+     *
+     * @param resource $stream
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function readCentralDirectoryEntry($stream)
+    {
+        if (unpack('V', fread($stream, 4))[1] !== ZipOutputStreamInterface::CENTRAL_FILE_HEADER_SIG) {
+            throw new ZipException('Corrupt zip file. Cannot read central dir entry.');
+        }
+
+        $data = unpack(
+            'vversionMadeBy/vversionNeededToExtract/' .
+            'vgeneralPurposeBitFlag/vcompressionMethod/' .
+            'VlastModFile/Vcrc/VcompressedSize/' .
+            'VuncompressedSize/vfileNameLength/vextraFieldLength/' .
+            'vfileCommentLength/vdiskNumberStart/vinternalFileAttributes/' .
+            'VexternalFileAttributes/VoffsetLocalHeader',
+            fread($stream, 42)
+        );
+
+        $createdOS = ($data['versionMadeBy'] & 0xFF00) >> 8;
+        $softwareVersion = $data['versionMadeBy'] & 0x00FF;
+
+        $extractOS = ($data['versionNeededToExtract'] & 0xFF00) >> 8;
+        $extractVersion = $data['versionNeededToExtract'] & 0x00FF;
+
+        $name = fread($stream, $data['fileNameLength']);
+
+        $extra = '';
+
+        if ($data['extraFieldLength'] > 0) {
+            $extra = fread($stream, $data['extraFieldLength']);
+        }
+
+        $comment = null;
+
+        if ($data['fileCommentLength'] > 0) {
+            $comment = fread($stream, $data['fileCommentLength']);
+        }
+
+        $entry = new ZipSourceEntry($this);
+        $entry->setName($name);
+        $entry->setCreatedOS($createdOS);
+        $entry->setSoftwareVersion($softwareVersion);
+        $entry->setVersionNeededToExtract($extractVersion);
+        $entry->setExtractedOS($extractOS);
+        $entry->setMethod($data['compressionMethod']);
+        $entry->setGeneralPurposeBitFlags($data['generalPurposeBitFlag']);
+        $entry->setDosTime($data['lastModFile']);
+        $entry->setCrc($data['crc']);
+        $entry->setCompressedSize($data['compressedSize']);
+        $entry->setSize($data['uncompressedSize']);
+        $entry->setInternalAttributes($data['internalFileAttributes']);
+        $entry->setExternalAttributes($data['externalFileAttributes']);
+        $entry->setOffset($data['offsetLocalHeader']);
+        $entry->setComment($comment);
+        $entry->setExtra($extra);
+
+        return $entry;
+    }
+
+    /**
+     * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     *
+     * @return string
+     */
+    public function readEntryContent(ZipEntry $entry)
+    {
+        if ($entry->isDirectory()) {
+            return null;
+        }
+
+        if (!($entry instanceof ZipSourceEntry)) {
+            throw new InvalidArgumentException('entry must be ' . ZipSourceEntry::class);
+        }
+        $isEncrypted = $entry->isEncrypted();
+
+        if ($isEncrypted && $entry->getPassword() === null) {
+            throw new ZipException('Can not password from entry ' . $entry->getName());
+        }
+
+        $startPos = $pos = $entry->getOffset();
+
+        fseek($this->in, $startPos);
+
+        // local file header signature     4 bytes  (0x04034b50)
+        if (unpack('V', fread($this->in, 4))[1] !== ZipEntry::LOCAL_FILE_HEADER_SIG) {
+            throw new ZipException($entry->getName() . ' (expected Local File Header)');
+        }
+        fseek($this->in, $pos + ZipEntry::LOCAL_FILE_HEADER_FILE_NAME_LENGTH_POS);
+        // file name length                2 bytes
+        // extra field length              2 bytes
+        $data = unpack('vfileLength/vextraLength', fread($this->in, 4));
+        $pos += ZipEntry::LOCAL_FILE_HEADER_MIN_LEN + $data['fileLength'] + $data['extraLength'];
+
+        if ($entry->getCrc() === ZipEntry::UNKNOWN) {
+            throw new ZipException(sprintf('Missing crc for entry %s', $entry->getName()));
+        }
+
+        $method = $entry->getMethod();
+
+        fseek($this->in, $pos);
+
+        // Get raw entry content
+        $compressedSize = $entry->getCompressedSize();
+        $content = '';
+
+        if ($compressedSize > 0) {
+            $offset = 0;
+
+            while ($offset < $compressedSize) {
+                $read = min(8192 /* chunk size */, $compressedSize - $offset);
+                $content .= fread($this->in, $read);
+                $offset += $read;
+            }
+        }
+
+        $skipCheckCrc = false;
+
+        if ($isEncrypted) {
+            if ($method === ZipEntry::METHOD_WINZIP_AES) {
+                // Strong Encryption Specification - WinZip AES
+                $winZipAesEngine = new WinZipAesEngine($entry);
+                $content = $winZipAesEngine->decrypt($content);
+                /**
+                 * @var WinZipAesEntryExtraField $field
+                 */
+                $field = $entry->getExtraFieldsCollection()->get(WinZipAesEntryExtraField::getHeaderId());
+                $method = $field->getMethod();
+                $entry->setEncryptionMethod($field->getEncryptionMethod());
+                $skipCheckCrc = true;
+            } else {
+                // Traditional PKWARE Decryption
+                $zipCryptoEngine = new TraditionalPkwareEncryptionEngine($entry);
+                $content = $zipCryptoEngine->decrypt($content);
+                $entry->setEncryptionMethod(ZipFile::ENCRYPTION_METHOD_TRADITIONAL);
+            }
+
+            if (!$skipCheckCrc) {
+                // Check CRC32 in the Local File Header or Data Descriptor.
+                $localCrc = null;
+
+                if ($entry->getGeneralPurposeBitFlag(ZipEntry::GPBF_DATA_DESCRIPTOR)) {
+                    // The CRC32 is in the Data Descriptor after the compressed size.
+                    // Note the Data Descriptor's Signature is optional:
+                    // All newer apps should write it (and so does TrueVFS),
+                    // but older apps might not.
+                    fseek($this->in, $pos + $compressedSize);
+                    $localCrc = unpack('V', fread($this->in, 4))[1];
+
+                    if ($localCrc === ZipEntry::DATA_DESCRIPTOR_SIG) {
+                        $localCrc = unpack('V', fread($this->in, 4))[1];
+                    }
+                } else {
+                    fseek($this->in, $startPos + 14);
+                    // The CRC32 in the Local File Header.
+                    $localCrc = fread($this->in, 4)[1];
+                }
+
+                if (\PHP_INT_SIZE === 4) {
+                    if (sprintf('%u', $entry->getCrc()) === sprintf('%u', $localCrc)) {
+                        throw new Crc32Exception($entry->getName(), $entry->getCrc(), $localCrc);
+                    }
+                } elseif ($localCrc !== $entry->getCrc()) {
+                    throw new Crc32Exception($entry->getName(), $entry->getCrc(), $localCrc);
+                }
+            }
+        }
+
+        switch ($method) {
+            case ZipFile::METHOD_STORED:
+                break;
+
+            case ZipFile::METHOD_DEFLATED:
+                /** @noinspection PhpUsageOfSilenceOperatorInspection */
+                $content = @gzinflate($content);
+                break;
+
+            case ZipFile::METHOD_BZIP2:
+                if (!\extension_loaded('bz2')) {
+                    throw new ZipException('Extension bzip2 not install');
+                }
+                /** @noinspection PhpComposerExtensionStubsInspection */
+                $content = bzdecompress($content);
+
+                if (\is_int($content)) { // decompress error
+                    $content = false;
+                }
+                break;
+            default:
+                throw new ZipUnsupportMethodException(
+                    $entry->getName() .
+                    ' (compression method ' . $method . ' is not supported)'
+                );
+        }
+
+        if ($content === false) {
+            if ($isEncrypted) {
+                throw new ZipAuthenticationException(
+                    sprintf(
+                        'Invalid password for zip entry "%s"',
+                        $entry->getName()
+                    )
+                );
+            }
+
+            throw new ZipException(
+                sprintf(
+                    'Failed to get the contents of the zip entry "%s"',
+                    $entry->getName()
+                )
+            );
+        }
+
+        if (!$skipCheckCrc) {
+            $localCrc = crc32($content);
+
+            if (sprintf('%u', $entry->getCrc()) !== sprintf('%u', $localCrc)) {
+                if ($isEncrypted) {
+                    throw new ZipAuthenticationException(
+                        sprintf(
+                            'Invalid password for zip entry "%s"',
+                            $entry->getName()
+                        )
+                    );
+                }
+
+                throw new Crc32Exception($entry->getName(), $entry->getCrc(), $localCrc);
+            }
+        }
+
+        return $content;
+    }
+
+    /**
+     * @return resource
+     */
+    public function getStream()
+    {
+        return $this->in;
+    }
+
+    /**
+     * Copy the input stream of the LOC entry zip and the data into
+     * the output stream and zip the alignment if necessary.
+     *
+     * @param ZipEntry                 $entry
+     * @param ZipOutputStreamInterface $out
+     *
+     * @throws ZipException
+     */
+    public function copyEntry(ZipEntry $entry, ZipOutputStreamInterface $out)
+    {
+        $pos = $entry->getOffset();
+
+        if ($pos === ZipEntry::UNKNOWN) {
+            throw new ZipException(sprintf('Missing local header offset for entry %s', $entry->getName()));
+        }
+
+        $nameLength = \strlen($entry->getName());
+
+        fseek($this->in, $pos + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN - 2, \SEEK_SET);
+        $sourceExtraLength = $destExtraLength = unpack('v', fread($this->in, 2))[1];
+
+        if ($sourceExtraLength > 0) {
+            // read Local File Header extra fields
+            fseek($this->in, $pos + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN + $nameLength, \SEEK_SET);
+            $extra = '';
+            $offset = 0;
+
+            while ($offset < $sourceExtraLength) {
+                $read = min(8192 /* chunk size */, $sourceExtraLength - $offset);
+                $extra .= fread($this->in, $read);
+                $offset += $read;
+            }
+            $extraFieldsCollection = ExtraFieldsFactory::createExtraFieldCollections($extra, $entry);
+
+            if (isset($extraFieldsCollection[ApkAlignmentExtraField::getHeaderId()]) && $this->zipModel->isZipAlign()) {
+                unset($extraFieldsCollection[ApkAlignmentExtraField::getHeaderId()]);
+                $destExtraLength = \strlen(ExtraFieldsFactory::createSerializedData($extraFieldsCollection));
+            }
+        } else {
+            $extraFieldsCollection = new ExtraFieldsCollection();
+        }
+
+        $dataAlignmentMultiple = $this->zipModel->getZipAlign();
+        $copyInToOutLength = $entry->getCompressedSize();
+
+        fseek($this->in, $pos, \SEEK_SET);
+
+        if (
+            $this->zipModel->isZipAlign() &&
+            !$entry->isEncrypted() &&
+            $entry->getMethod() === ZipFile::METHOD_STORED
+        ) {
+            if (StringUtil::endsWith($entry->getName(), '.so')) {
+                $dataAlignmentMultiple = ApkAlignmentExtraField::ANDROID_COMMON_PAGE_ALIGNMENT_BYTES;
+            }
+
+            $dataMinStartOffset =
+                ftell($out->getStream()) +
+                ZipEntry::LOCAL_FILE_HEADER_MIN_LEN +
+                $destExtraLength +
+                $nameLength +
+                ApkAlignmentExtraField::ALIGNMENT_ZIP_EXTRA_MIN_SIZE_BYTES;
+            $padding =
+                ($dataAlignmentMultiple - ($dataMinStartOffset % $dataAlignmentMultiple))
+                % $dataAlignmentMultiple;
+
+            $alignExtra = new ApkAlignmentExtraField();
+            $alignExtra->setMultiple($dataAlignmentMultiple);
+            $alignExtra->setPadding($padding);
+            $extraFieldsCollection->add($alignExtra);
+
+            $extra = ExtraFieldsFactory::createSerializedData($extraFieldsCollection);
+
+            // copy Local File Header without extra field length
+            // from input stream to output stream
+            stream_copy_to_stream($this->in, $out->getStream(), ZipEntry::LOCAL_FILE_HEADER_MIN_LEN - 2);
+            // write new extra field length (2 bytes) to output stream
+            fwrite($out->getStream(), pack('v', \strlen($extra)));
+            // skip 2 bytes to input stream
+            fseek($this->in, 2, \SEEK_CUR);
+            // copy name from input stream to output stream
+            stream_copy_to_stream($this->in, $out->getStream(), $nameLength);
+            // write extra field to output stream
+            fwrite($out->getStream(), $extra);
+            // skip source extraLength from input stream
+            fseek($this->in, $sourceExtraLength, \SEEK_CUR);
+        } else {
+            $copyInToOutLength += ZipEntry::LOCAL_FILE_HEADER_MIN_LEN + $sourceExtraLength + $nameLength;
+        }
+
+        if ($entry->getGeneralPurposeBitFlag(ZipEntry::GPBF_DATA_DESCRIPTOR)) {
+//            crc-32                          4 bytes
+//            compressed size                 4 bytes
+//            uncompressed size               4 bytes
+            $copyInToOutLength += 12;
+
+            if ($entry->isZip64ExtensionsRequired()) {
+//              compressed size                 +4 bytes
+//              uncompressed size               +4 bytes
+                $copyInToOutLength += 8;
+            }
+        }
+        // copy loc, data, data descriptor from input to output stream
+        stream_copy_to_stream($this->in, $out->getStream(), $copyInToOutLength);
+    }
+
+    /**
+     * @param ZipEntry                 $entry
+     * @param ZipOutputStreamInterface $out
+     */
+    public function copyEntryData(ZipEntry $entry, ZipOutputStreamInterface $out)
+    {
+        $offset = $entry->getOffset();
+        $nameLength = \strlen($entry->getName());
+
+        fseek($this->in, $offset + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN - 2, \SEEK_SET);
+        $extraLength = unpack('v', fread($this->in, 2))[1];
+
+        fseek($this->in, $offset + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN + $nameLength + $extraLength, \SEEK_SET);
+        // copy raw data from input stream to output stream
+        stream_copy_to_stream($this->in, $out->getStream(), $entry->getCompressedSize());
+    }
+
+    public function __destruct()
+    {
+        $this->close();
+    }
+
+    public function close()
+    {
+        if ($this->in !== null) {
+            fclose($this->in);
+            $this->in = null;
+        }
+    }
+}

src/PhpZip/Stream/ZipInputStreamInterface.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace PhpZip\Stream;
+
+use PhpZip\Exception\ZipException;
+use PhpZip\Model\ZipEntry;
+use PhpZip\Model\ZipModel;
+
+/**
+ * Read zip file.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+interface ZipInputStreamInterface
+{
+    /**
+     * @return ZipModel
+     */
+    public function readZip();
+
+    /**
+     * Read central directory entry.
+     *
+     * @param resource $stream
+     *
+     * @throws ZipException
+     *
+     * @return ZipEntry
+     */
+    public function readCentralDirectoryEntry($stream);
+
+    /**
+     * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     *
+     * @return string
+     */
+    public function readEntryContent(ZipEntry $entry);
+
+    /**
+     * @return resource
+     */
+    public function getStream();
+
+    /**
+     * Copy the input stream of the LOC entry zip and the data into
+     * the output stream and zip the alignment if necessary.
+     *
+     * @param ZipEntry                 $entry
+     * @param ZipOutputStreamInterface $out
+     */
+    public function copyEntry(ZipEntry $entry, ZipOutputStreamInterface $out);
+
+    /**
+     * @param ZipEntry                 $entry
+     * @param ZipOutputStreamInterface $out
+     */
+    public function copyEntryData(ZipEntry $entry, ZipOutputStreamInterface $out);
+
+    public function close();
+}

src/PhpZip/Stream/ZipOutputStream.php

@@ -0,0 +1,606 @@
+<?php
+
+namespace PhpZip\Stream;
+
+use PhpZip\Crypto\TraditionalPkwareEncryptionEngine;
+use PhpZip\Crypto\WinZipAesEngine;
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\RuntimeException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Extra\ExtraFieldsFactory;
+use PhpZip\Extra\Fields\ApkAlignmentExtraField;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
+use PhpZip\Extra\Fields\Zip64ExtraField;
+use PhpZip\Model\EndOfCentralDirectory;
+use PhpZip\Model\Entry\OutputOffsetEntry;
+use PhpZip\Model\Entry\ZipChangesEntry;
+use PhpZip\Model\Entry\ZipSourceEntry;
+use PhpZip\Model\ZipEntry;
+use PhpZip\Model\ZipModel;
+use PhpZip\Util\PackUtil;
+use PhpZip\Util\StringUtil;
+use PhpZip\ZipFile;
+
+/**
+ * Write zip file.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipOutputStream implements ZipOutputStreamInterface
+{
+    /** @var resource */
+    protected $out;
+
+    /** @var ZipModel */
+    protected $zipModel;
+
+    /**
+     * ZipOutputStream constructor.
+     *
+     * @param resource $out
+     * @param ZipModel $zipModel
+     */
+    public function __construct($out, ZipModel $zipModel)
+    {
+        if (!\is_resource($out)) {
+            throw new InvalidArgumentException('$out must be resource');
+        }
+        $this->out = $out;
+        $this->zipModel = $zipModel;
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function writeZip()
+    {
+        $entries = $this->zipModel->getEntries();
+        $outPosEntries = [];
+
+        foreach ($entries as $entry) {
+            $outPosEntries[] = new OutputOffsetEntry(ftell($this->out), $entry);
+            $this->writeEntry($entry);
+        }
+        $centralDirectoryOffset = ftell($this->out);
+
+        foreach ($outPosEntries as $outputEntry) {
+            $this->writeCentralDirectoryHeader($outputEntry);
+        }
+        $this->writeEndOfCentralDirectoryRecord($centralDirectoryOffset);
+    }
+
+    /**
+     * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     */
+    public function writeEntry(ZipEntry $entry)
+    {
+        if ($entry instanceof ZipSourceEntry) {
+            $entry->getInputStream()->copyEntry($entry, $this);
+
+            return;
+        }
+
+        $entryContent = $this->entryCommitChangesAndReturnContent($entry);
+
+        $offset = ftell($this->out);
+        $compressedSize = $entry->getCompressedSize();
+
+        $extra = $entry->getExtra();
+
+        $nameLength = \strlen($entry->getName());
+        $extraLength = \strlen($extra);
+
+        // zip align
+        if (
+            $this->zipModel->isZipAlign() &&
+            !$entry->isEncrypted() &&
+            $entry->getMethod() === ZipFile::METHOD_STORED
+        ) {
+            $dataAlignmentMultiple = $this->zipModel->getZipAlign();
+
+            if (StringUtil::endsWith($entry->getName(), '.so')) {
+                $dataAlignmentMultiple = ApkAlignmentExtraField::ANDROID_COMMON_PAGE_ALIGNMENT_BYTES;
+            }
+            $dataMinStartOffset =
+                $offset +
+                ZipEntry::LOCAL_FILE_HEADER_MIN_LEN +
+                $extraLength +
+                $nameLength +
+                ApkAlignmentExtraField::ALIGNMENT_ZIP_EXTRA_MIN_SIZE_BYTES;
+
+            $padding =
+                ($dataAlignmentMultiple - ($dataMinStartOffset % $dataAlignmentMultiple))
+                % $dataAlignmentMultiple;
+
+            $alignExtra = new ApkAlignmentExtraField();
+            $alignExtra->setMultiple($dataAlignmentMultiple);
+            $alignExtra->setPadding($padding);
+
+            $extraFieldsCollection = clone $entry->getExtraFieldsCollection();
+            $extraFieldsCollection->add($alignExtra);
+
+            $extra = ExtraFieldsFactory::createSerializedData($extraFieldsCollection);
+            $extraLength = \strlen($extra);
+        }
+
+        $size = $nameLength + $extraLength;
+
+        if ($size > 0xffff) {
+            throw new ZipException(
+                $entry->getName() . ' (the total size of ' . $size .
+                ' bytes for the name, extra fields and comment ' .
+                'exceeds the maximum size of ' . 0xffff . ' bytes)'
+            );
+        }
+
+        $dd = $entry->isDataDescriptorRequired();
+        fwrite(
+            $this->out,
+            pack(
+                'VvvvVVVVvv',
+                // local file header signature     4 bytes  (0x04034b50)
+                ZipEntry::LOCAL_FILE_HEADER_SIG,
+                // version needed to extract       2 bytes
+                ($entry->getExtractedOS() << 8) | $entry->getVersionNeededToExtract(),
+                // general purpose bit flag        2 bytes
+                $entry->getGeneralPurposeBitFlags(),
+                // compression method              2 bytes
+                $entry->getMethod(),
+                // last mod file time              2 bytes
+                // last mod file date              2 bytes
+                $entry->getDosTime(),
+                // crc-32                          4 bytes
+                $dd ? 0 : $entry->getCrc(),
+                // compressed size                 4 bytes
+                $dd ? 0 : $entry->getCompressedSize(),
+                // uncompressed size               4 bytes
+                $dd ? 0 : $entry->getSize(),
+                // file name length                2 bytes
+                $nameLength,
+                // extra field length              2 bytes
+                $extraLength
+            )
+        );
+
+        if ($nameLength > 0) {
+            fwrite($this->out, $entry->getName());
+        }
+
+        if ($extraLength > 0) {
+            fwrite($this->out, $extra);
+        }
+
+        if ($entry instanceof ZipChangesEntry && !$entry->isChangedContent()) {
+            $entry->getSourceEntry()->getInputStream()->copyEntryData($entry->getSourceEntry(), $this);
+        } elseif ($entryContent !== null) {
+            fwrite($this->out, $entryContent);
+        }
+
+        if ($entry->getCrc() === ZipEntry::UNKNOWN) {
+            throw new ZipException(sprintf('No crc for entry %s', $entry->getName()));
+        }
+
+        if ($entry->getSize() === ZipEntry::UNKNOWN) {
+            throw new ZipException(sprintf('No uncompressed size for entry %s', $entry->getName()));
+        }
+
+        if ($entry->getCompressedSize() === ZipEntry::UNKNOWN) {
+            throw new ZipException(sprintf('No compressed size for entry %s', $entry->getName()));
+        }
+
+        if ($entry->getGeneralPurposeBitFlag(ZipEntry::GPBF_DATA_DESCRIPTOR)) {
+            // data descriptor signature       4 bytes  (0x08074b50)
+            // crc-32                          4 bytes
+            fwrite($this->out, pack('VV', ZipEntry::DATA_DESCRIPTOR_SIG, $entry->getCrc()));
+            // compressed size                 4 or 8 bytes
+            // uncompressed size               4 or 8 bytes
+            if ($entry->isZip64ExtensionsRequired()) {
+                fwrite($this->out, PackUtil::packLongLE($compressedSize));
+                fwrite($this->out, PackUtil::packLongLE($entry->getSize()));
+            } else {
+                fwrite($this->out, pack('VV', $entry->getCompressedSize(), $entry->getSize()));
+            }
+        } elseif ($compressedSize !== $entry->getCompressedSize()) {
+            throw new ZipException(
+                $entry->getName() . ' (expected compressed entry size of '
+                . $entry->getCompressedSize() . ' bytes, ' .
+                'but is actually ' . $compressedSize . ' bytes)'
+            );
+        }
+    }
+
+    /**
+     * @param ZipEntry $entry
+     *
+     * @throws ZipException
+     *
+     * @return string|null
+     */
+    protected function entryCommitChangesAndReturnContent(ZipEntry $entry)
+    {
+        if ($entry->getCreatedOS() === ZipEntry::UNKNOWN) {
+            $entry->setCreatedOS(ZipEntry::PLATFORM_UNIX);
+        }
+
+        if ($entry->getSoftwareVersion() === ZipEntry::UNKNOWN) {
+            $entry->setSoftwareVersion(63);
+        }
+
+        if ($entry->getExtractedOS() === ZipEntry::UNKNOWN) {
+            $entry->setExtractedOS(ZipEntry::PLATFORM_UNIX);
+        }
+
+        if ($entry->getTime() === ZipEntry::UNKNOWN) {
+            $entry->setTime(time());
+        }
+        $method = $entry->getMethod();
+
+        $encrypted = $entry->isEncrypted();
+        // See appendix D of PKWARE's ZIP File Format Specification.
+        $utf8 = true;
+
+        if ($encrypted && $entry->getPassword() === null) {
+            throw new ZipException(sprintf('Password not set for entry %s', $entry->getName()));
+        }
+
+        // Compose General Purpose Bit Flag.
+        $general = ($encrypted ? ZipEntry::GPBF_ENCRYPTED : 0)
+            | ($entry->isDataDescriptorRequired() ? ZipEntry::GPBF_DATA_DESCRIPTOR : 0)
+            | ($utf8 ? ZipEntry::GPBF_UTF8 : 0);
+
+        $entryContent = null;
+        $extraFieldsCollection = $entry->getExtraFieldsCollection();
+
+        if (!($entry instanceof ZipChangesEntry && !$entry->isChangedContent())) {
+            $entryContent = $entry->getEntryContent();
+
+            if ($entryContent !== null) {
+                $entry->setSize(\strlen($entryContent));
+                $entry->setCrc(crc32($entryContent));
+
+                if ($encrypted && $method === ZipEntry::METHOD_WINZIP_AES) {
+                    /**
+                     * @var WinZipAesEntryExtraField $field
+                     */
+                    $field = $extraFieldsCollection->get(WinZipAesEntryExtraField::getHeaderId());
+
+                    if ($field !== null) {
+                        $method = $field->getMethod();
+                    }
+                }
+
+                switch ($method) {
+                    case ZipFile::METHOD_STORED:
+                        break;
+
+                    case ZipFile::METHOD_DEFLATED:
+                        $entryContent = gzdeflate($entryContent, $entry->getCompressionLevel());
+                        break;
+
+                    case ZipFile::METHOD_BZIP2:
+                        $compressionLevel = $entry->getCompressionLevel() === ZipFile::LEVEL_DEFAULT_COMPRESSION ?
+                            ZipEntry::LEVEL_DEFAULT_BZIP2_COMPRESSION :
+                            $entry->getCompressionLevel();
+                        /** @noinspection PhpComposerExtensionStubsInspection */
+                        $entryContent = bzcompress($entryContent, $compressionLevel);
+
+                        if (\is_int($entryContent)) {
+                            throw new ZipException('Error bzip2 compress. Error code: ' . $entryContent);
+                        }
+                        break;
+
+                    case ZipEntry::UNKNOWN:
+                        $entryContent = $this->determineBestCompressionMethod($entry, $entryContent);
+                        $method = $entry->getMethod();
+                        break;
+
+                    default:
+                        throw new ZipException($entry->getName() . ' (unsupported compression method ' . $method . ')');
+                }
+
+                if ($method === ZipFile::METHOD_DEFLATED) {
+                    $bit1 = false;
+                    $bit2 = false;
+                    switch ($entry->getCompressionLevel()) {
+                        case ZipFile::LEVEL_BEST_COMPRESSION:
+                            $bit1 = true;
+                            break;
+
+                        case ZipFile::LEVEL_FAST:
+                            $bit2 = true;
+                            break;
+
+                        case ZipFile::LEVEL_SUPER_FAST:
+                            $bit1 = true;
+                            $bit2 = true;
+                            break;
+                    }
+
+                    $general |= ($bit1 ? ZipEntry::GPBF_COMPRESSION_FLAG1 : 0);
+                    $general |= ($bit2 ? ZipEntry::GPBF_COMPRESSION_FLAG2 : 0);
+                }
+
+                if ($encrypted) {
+                    if (\in_array(
+                        $entry->getEncryptionMethod(),
+                        [
+                            ZipFile::ENCRYPTION_METHOD_WINZIP_AES_128,
+                            ZipFile::ENCRYPTION_METHOD_WINZIP_AES_192,
+                            ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256,
+                        ],
+                        true
+                    )) {
+                        $keyStrength = WinZipAesEntryExtraField::getKeyStrangeFromEncryptionMethod(
+                            $entry->getEncryptionMethod()
+                        ); // size bits
+                        $field = ExtraFieldsFactory::createWinZipAesEntryExtra();
+                        $field->setKeyStrength($keyStrength);
+                        $field->setMethod($method);
+                        $size = $entry->getSize();
+
+                        if ($size >= 20 && $method !== ZipFile::METHOD_BZIP2) {
+                            $field->setVendorVersion(WinZipAesEntryExtraField::VV_AE_1);
+                        } else {
+                            $field->setVendorVersion(WinZipAesEntryExtraField::VV_AE_2);
+                            $entry->setCrc(0);
+                        }
+                        $extraFieldsCollection->add($field);
+                        $entry->setMethod(ZipEntry::METHOD_WINZIP_AES);
+
+                        $winZipAesEngine = new WinZipAesEngine($entry);
+                        $entryContent = $winZipAesEngine->encrypt($entryContent);
+                    } elseif ($entry->getEncryptionMethod() === ZipFile::ENCRYPTION_METHOD_TRADITIONAL) {
+                        $zipCryptoEngine = new TraditionalPkwareEncryptionEngine($entry);
+                        $entryContent = $zipCryptoEngine->encrypt($entryContent);
+                    }
+                }
+
+                $compressedSize = \strlen($entryContent);
+                $entry->setCompressedSize($compressedSize);
+            }
+        }
+
+        // Commit changes.
+        $entry->setGeneralPurposeBitFlags($general);
+
+        if ($entry->isZip64ExtensionsRequired()) {
+            $extraFieldsCollection->add(ExtraFieldsFactory::createZip64Extra($entry));
+        } elseif ($extraFieldsCollection->has(Zip64ExtraField::getHeaderId())) {
+            $extraFieldsCollection->remove(Zip64ExtraField::getHeaderId());
+        }
+
+        return $entryContent;
+    }
+
+    /**
+     * @param ZipEntry $entry
+     * @param string   $content
+     *
+     * @throws ZipException
+     *
+     * @return string
+     */
+    protected function determineBestCompressionMethod(ZipEntry $entry, $content)
+    {
+        if ($content !== null) {
+            $entryContent = gzdeflate($content, $entry->getCompressionLevel());
+
+            if (\strlen($entryContent) < \strlen($content)) {
+                $entry->setMethod(ZipFile::METHOD_DEFLATED);
+
+                return $entryContent;
+            }
+            $entry->setMethod(ZipFile::METHOD_STORED);
+        }
+
+        return $content;
+    }
+
+    /**
+     * Writes a Central File Header record.
+     *
+     * @param OutputOffsetEntry $outEntry
+     */
+    protected function writeCentralDirectoryHeader(OutputOffsetEntry $outEntry)
+    {
+        $entry = $outEntry->getEntry();
+        $compressedSize = $entry->getCompressedSize();
+        $size = $entry->getSize();
+        // This test MUST NOT include the CRC-32 because VV_AE_2 sets it to
+        // UNKNOWN!
+        if (($compressedSize | $size) === ZipEntry::UNKNOWN) {
+            throw new RuntimeException('invalid entry');
+        }
+        $extra = $entry->getExtra();
+        $extraSize = \strlen($extra);
+
+        $commentLength = \strlen($entry->getComment());
+        fwrite(
+            $this->out,
+            pack(
+                'VvvvvVVVVvvvvvVV',
+                // central file header signature   4 bytes  (0x02014b50)
+                self::CENTRAL_FILE_HEADER_SIG,
+                // version made by                 2 bytes
+                ($entry->getCreatedOS() << 8) | $entry->getSoftwareVersion(),
+                // version needed to extract       2 bytes
+                ($entry->getExtractedOS() << 8) | $entry->getVersionNeededToExtract(),
+                // general purpose bit flag        2 bytes
+                $entry->getGeneralPurposeBitFlags(),
+                // compression method              2 bytes
+                $entry->getMethod(),
+                // last mod file datetime          4 bytes
+                $entry->getDosTime(),
+                // crc-32                          4 bytes
+                $entry->getCrc(),
+                // compressed size                 4 bytes
+                $entry->getCompressedSize(),
+                // uncompressed size               4 bytes
+                $entry->getSize(),
+                // file name length                2 bytes
+                \strlen($entry->getName()),
+                // extra field length              2 bytes
+                $extraSize,
+                // file comment length             2 bytes
+                $commentLength,
+                // disk number start               2 bytes
+                0,
+                // internal file attributes        2 bytes
+                $entry->getInternalAttributes(),
+                // external file attributes        4 bytes
+                $entry->getExternalAttributes(),
+                // relative offset of local header 4 bytes
+                $outEntry->getOffset()
+            )
+        );
+        // file name (variable size)
+        fwrite($this->out, $entry->getName());
+
+        if ($extraSize > 0) {
+            // extra field (variable size)
+            fwrite($this->out, $extra);
+        }
+
+        if ($commentLength > 0) {
+            // file comment (variable size)
+            fwrite($this->out, $entry->getComment());
+        }
+    }
+
+    /**
+     * @param int $centralDirectoryOffset
+     */
+    protected function writeEndOfCentralDirectoryRecord($centralDirectoryOffset)
+    {
+        $cdEntriesCount = \count($this->zipModel);
+
+        $position = ftell($this->out);
+        $centralDirectorySize = $position - $centralDirectoryOffset;
+
+        $cdEntriesZip64 = $cdEntriesCount > 0xFFFF;
+        $cdSizeZip64 = $centralDirectorySize > 0xFFFFFFFF;
+        $cdOffsetZip64 = $centralDirectoryOffset > 0xFFFFFFFF;
+
+        $zip64Required = $cdEntriesZip64 || $cdSizeZip64 || $cdOffsetZip64;
+
+        if ($zip64Required) {
+            $zip64EndOfCentralDirectoryOffset = ftell($this->out);
+
+            // find max software version, version needed to extract and most common platform
+            list($softwareVersion, $versionNeededToExtract) = array_reduce(
+                $this->zipModel->getEntries(),
+                static function (array $carry, ZipEntry $entry) {
+                    $carry[0] = max($carry[0], $entry->getSoftwareVersion() & 0xFF);
+                    $carry[1] = max($carry[1], $entry->getVersionNeededToExtract() & 0xFF);
+
+                    return $carry;
+                },
+                [10 /* simple file min ver */, 45 /* zip64 ext min ver */]
+            );
+
+            $createdOS = $extractedOS = ZipEntry::PLATFORM_FAT;
+            $versionMadeBy = ($createdOS << 8) | max($softwareVersion, 45 /* zip64 ext min ver */);
+            $versionExtractedBy = ($extractedOS << 8) | max($versionNeededToExtract, 45 /* zip64 ext min ver */);
+
+            // signature                       4 bytes  (0x06064b50)
+            fwrite($this->out, pack('V', EndOfCentralDirectory::ZIP64_END_OF_CD_RECORD_SIG));
+            // size of zip64 end of central
+            // directory record                8 bytes
+            fwrite($this->out, PackUtil::packLongLE(44));
+            fwrite(
+                $this->out,
+                pack(
+                    'vvVV',
+                    // version made by                 2 bytes
+                    $versionMadeBy & 0xFFFF,
+                    // version needed to extract       2 bytes
+                    $versionExtractedBy & 0xFFFF,
+                    // number of this disk             4 bytes
+                    0,
+                    // number of the disk with the
+                    // start of the central directory  4 bytes
+                    0
+                )
+            );
+            // total number of entries in the
+            // central directory on this disk  8 bytes
+            fwrite($this->out, PackUtil::packLongLE($cdEntriesCount));
+            // total number of entries in the
+            // central directory               8 bytes
+            fwrite($this->out, PackUtil::packLongLE($cdEntriesCount));
+            // size of the central directory   8 bytes
+            fwrite($this->out, PackUtil::packLongLE($centralDirectorySize));
+            // offset of start of central
+            // directory with respect to
+            // the starting disk number        8 bytes
+            fwrite($this->out, PackUtil::packLongLE($centralDirectoryOffset));
+
+            // write zip64 end of central directory locator
+            fwrite(
+                $this->out,
+                pack(
+                    'VV',
+                    // zip64 end of central dir locator
+                    // signature                       4 bytes  (0x07064b50)
+                    EndOfCentralDirectory::ZIP64_END_OF_CD_LOCATOR_SIG,
+                    // number of the disk with the
+                    // start of the zip64 end of
+                    // central directory               4 bytes
+                    0
+                )
+            );
+            // relative offset of the zip64
+            // end of central directory record 8 bytes
+            fwrite($this->out, PackUtil::packLongLE($zip64EndOfCentralDirectoryOffset));
+            // total number of disks           4 bytes
+            fwrite($this->out, pack('V', 1));
+        }
+
+        $comment = $this->zipModel->getArchiveComment();
+        $commentLength = $comment !== null ? \strlen($comment) : 0;
+
+        fwrite(
+            $this->out,
+            pack(
+                'VvvvvVVv',
+                // end of central dir signature    4 bytes  (0x06054b50)
+                EndOfCentralDirectory::END_OF_CD_SIG,
+                // number of this disk             2 bytes
+                0,
+                // number of the disk with the
+                // start of the central directory  2 bytes
+                0,
+                // total number of entries in the
+                // central directory on this disk  2 bytes
+                $cdEntriesZip64 ? 0xFFFF : $cdEntriesCount,
+                // total number of entries in
+                // the central directory           2 bytes
+                $cdEntriesZip64 ? 0xFFFF : $cdEntriesCount,
+                // size of the central directory   4 bytes
+                $cdSizeZip64 ? 0xFFFFFFFF : $centralDirectorySize,
+                // offset of start of central
+                // directory with respect to
+                // the starting disk number        4 bytes
+                $cdOffsetZip64 ? 0xFFFFFFFF : $centralDirectoryOffset,
+                // .ZIP file comment length        2 bytes
+                $commentLength
+            )
+        );
+
+        if ($commentLength > 0) {
+            // .ZIP file comment       (variable size)
+            fwrite($this->out, $comment);
+        }
+    }
+
+    /**
+     * @return resource
+     */
+    public function getStream()
+    {
+        return $this->out;
+    }
+}

src/PhpZip/Stream/ZipOutputStreamInterface.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace PhpZip\Stream;
+
+use PhpZip\Model\ZipEntry;
+
+/**
+ * Write zip file.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+interface ZipOutputStreamInterface
+{
+    /** Central File Header signature. */
+    const CENTRAL_FILE_HEADER_SIG = 0x02014B50;
+
+    public function writeZip();
+
+    /**
+     * @param ZipEntry $entry
+     */
+    public function writeEntry(ZipEntry $entry);
+
+    /**
+     * @return resource
+     */
+    public function getStream();
+}

src/PhpZip/Util/CryptoUtil.php

@@ -1,32 +1,27 @@
 <?php
+
 namespace PhpZip\Util;
 
-use PhpZip\Exception\ZipException;
-
 /**
- * Crypto Utils
+ * Crypto Utils.
+ *
+ * @deprecated
  */
 class CryptoUtil
 {
-
     /**
      * Returns random bytes.
      *
      * @param int $length
+     *
+     * @throws \Exception
+     *
      * @return string
-     * @throws ZipException
+     *
+     * @deprecated Use random_bytes()
      */
-    public static final function randomBytes($length)
+    final public static function randomBytes($length)
     {
-        $length = (int)$length;
-        if (function_exists('random_bytes')) {
-            return random_bytes($length);
-        } elseif (function_exists('openssl_random_pseudo_bytes')) {
-            return openssl_random_pseudo_bytes($length);
-        } elseif (function_exists('mcrypt_create_iv')) {
-            return mcrypt_create_iv($length);
-        } else {
-            throw new ZipException('Extension openssl or mcrypt not loaded');
-        }
+        return random_bytes($length);
     }
-}
+}

src/PhpZip/Util/DateTimeConverter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util;
 
 use PhpZip\Exception\ZipException;
@@ -27,21 +28,22 @@ class DateTimeConverter
      * Convert a 32 bit integer DOS date/time value to a UNIX timestamp value.
      *
      * @param int $dosTime Dos date/time
+     *
      * @return int Unix timestamp
      */
     public static function toUnixTimestamp($dosTime)
     {
-        if (self::MIN_DOS_TIME > $dosTime) {
+        if ($dosTime < self::MIN_DOS_TIME) {
             $dosTime = self::MIN_DOS_TIME;
-        } elseif (self::MAX_DOS_TIME < $dosTime) {
+        } elseif ($dosTime > self::MAX_DOS_TIME) {
             $dosTime = self::MAX_DOS_TIME;
         }
 
         return mktime(
             ($dosTime >> 11) & 0x1f,         // hour
-            ($dosTime >> 5) & 0x3f,          // minute
-            2 * ($dosTime & 0x1f),           // second
-            ($dosTime >> 21) & 0x0f,         // month
+            ($dosTime >> 5) & 0x3f,        // minute
+            2 * ($dosTime & 0x1f),         // second
+            ($dosTime >> 21) & 0x0f,       // month
             ($dosTime >> 16) & 0x1f,         // day
             1980 + (($dosTime >> 25) & 0x7f) // year
         );
@@ -50,17 +52,19 @@ class DateTimeConverter
     /**
      * Converts a UNIX timestamp value to a DOS date/time value.
      *
-     * @param int $unixTimestamp The number of seconds since midnight, January 1st,
-     *         1970 AD UTC.
-     * @return int A DOS date/time value reflecting the local time zone and
-     *         rounded down to even seconds
-     *         and is in between DateTimeConverter::MIN_DOS_TIME and DateTimeConverter::MAX_DOS_TIME.
-     * @throws ZipException If unix timestamp is negative.
+     * @param int $unixTimestamp the number of seconds since midnight, January 1st,
+     *                           1970 AD UTC
+     *
+     * @throws ZipException if unix timestamp is negative
+     *
+     * @return int a DOS date/time value reflecting the local time zone and
+     *             rounded down to even seconds
+     *             and is in between DateTimeConverter::MIN_DOS_TIME and DateTimeConverter::MAX_DOS_TIME
      */
     public static function toDosTime($unixTimestamp)
     {
-        if (0 > $unixTimestamp) {
-            throw new ZipException("Negative unix timestamp: " . $unixTimestamp);
+        if ($unixTimestamp < 0) {
+            throw new ZipException('Negative unix timestamp: ' . $unixTimestamp);
         }
 
         $date = getdate($unixTimestamp);
@@ -70,8 +74,9 @@ class DateTimeConverter
         }
 
         $date['year'] -= 1980;
-        return ($date['year'] << 25 | $date['mon'] << 21 |
+
+        return $date['year'] << 25 | $date['mon'] << 21 |
             $date['mday'] << 16 | $date['hours'] << 11 |
-            $date['minutes'] << 5 | $date['seconds'] >> 1);
+            $date['minutes'] << 5 | $date['seconds'] >> 1;
     }
-}
+}

src/PhpZip/Util/FilesUtil.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util;
 
 use PhpZip\Util\Iterator\IgnoreFilesFilterIterator;
@@ -9,14 +10,16 @@ use PhpZip\Util\Iterator\IgnoreFilesRecursiveFilterIterator;
  *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
+ *
+ * @internal
  */
-class FilesUtil
+final class FilesUtil
 {
-
     /**
-     * Is empty directory
+     * Is empty directory.
      *
      * @param string $dir Directory
+     *
      * @return bool
      */
     public static function isEmptyDir($dir)
@@ -24,13 +27,14 @@ class FilesUtil
         if (!is_readable($dir)) {
             return false;
         }
-        return count(scandir($dir)) === 2;
+
+        return \count(scandir($dir)) === 2;
     }
 
     /**
      * Remove recursive directory.
      *
-     * @param string $dir Directory path.
+     * @param string $dir directory path
      */
     public static function removeDir($dir)
     {
@@ -38,6 +42,7 @@ class FilesUtil
             new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
             \RecursiveIteratorIterator::CHILD_FIRST
         );
+
         foreach ($files as $fileInfo) {
             $function = ($fileInfo->isDir() ? 'rmdir' : 'unlink');
             $function($fileInfo->getRealPath());
@@ -45,11 +50,11 @@ class FilesUtil
         rmdir($dir);
     }
 
-
     /**
      * Convert glob pattern to regex pattern.
      *
      * @param string $globPattern
+     *
      * @return string
      */
     public static function convertGlobToRegEx($globPattern)
@@ -60,16 +65,19 @@ class FilesUtil
         $inCurrent = 0;
         $chars = str_split($globPattern);
         $regexPattern = '';
-        foreach ($chars AS $currentChar) {
+
+        foreach ($chars as $currentChar) {
             switch ($currentChar) {
                 case '*':
-                    $regexPattern .= ($escaping ? "\\*" : '.*');
+                    $regexPattern .= ($escaping ? '\\*' : '.*');
                     $escaping = false;
                     break;
+
                 case '?':
-                    $regexPattern .= ($escaping ? "\\?" : '.');
+                    $regexPattern .= ($escaping ? '\\?' : '.');
                     $escaping = false;
                     break;
+
                 case '.':
                 case '(':
                 case ')':
@@ -82,46 +90,53 @@ class FilesUtil
                     $regexPattern .= '\\' . $currentChar;
                     $escaping = false;
                     break;
+
                 case '\\':
                     if ($escaping) {
-                        $regexPattern .= "\\\\";
+                        $regexPattern .= '\\\\';
                         $escaping = false;
                     } else {
                         $escaping = true;
                     }
                     break;
+
                 case '{':
                     if ($escaping) {
-                        $regexPattern .= "\\{";
+                        $regexPattern .= '\\{';
                     } else {
                         $regexPattern = '(';
                         $inCurrent++;
                     }
                     $escaping = false;
                     break;
+
                 case '}':
                     if ($inCurrent > 0 && !$escaping) {
                         $regexPattern .= ')';
                         $inCurrent--;
-                    } else if ($escaping)
-                        $regexPattern = "\\}";
-                    else
-                        $regexPattern = "}";
+                    } elseif ($escaping) {
+                        $regexPattern = '\\}';
+                    } else {
+                        $regexPattern = '}';
+                    }
                     $escaping = false;
                     break;
+
                 case ',':
                     if ($inCurrent > 0 && !$escaping) {
                         $regexPattern .= '|';
-                    } else if ($escaping)
-                        $regexPattern .= "\\,";
-                    else
-                        $regexPattern = ",";
+                    } elseif ($escaping) {
+                        $regexPattern .= '\\,';
+                    } else {
+                        $regexPattern = ',';
+                    }
                     break;
                 default:
                     $escaping = false;
                     $regexPattern .= $currentChar;
             }
         }
+
         return $regexPattern;
     }
 
@@ -129,8 +144,9 @@ class FilesUtil
      * Search files.
      *
      * @param string $inputDir
-     * @param bool $recursive
-     * @param array $ignoreFiles
+     * @param bool   $recursive
+     * @param array  $ignoreFiles
+     *
      * @return array Searched file list
      */
     public static function fileSearchWithIgnore($inputDir, $recursive = true, array $ignoreFiles = [])
@@ -150,11 +166,13 @@ class FilesUtil
             new \IteratorIterator($directoryIterator);
 
         $fileList = [];
+
         foreach ($iterator as $file) {
             if ($file instanceof \SplFileInfo) {
                 $fileList[] = $file->getPathname();
             }
         }
+
         return $fileList;
     }
 
@@ -162,21 +180,27 @@ class FilesUtil
      * Search files from glob pattern.
      *
      * @param string $globPattern
-     * @param int $flags
-     * @param bool $recursive
+     * @param int    $flags
+     * @param bool   $recursive
+     *
      * @return array Searched file list
      */
     public static function globFileSearch($globPattern, $flags = 0, $recursive = true)
     {
-        $flags = (int)$flags;
-        $recursive = (bool)$recursive;
+        $flags = (int) $flags;
+        $recursive = (bool) $recursive;
         $files = glob($globPattern, $flags);
+
         if (!$recursive) {
             return $files;
         }
-        foreach (glob(dirname($globPattern) . '/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
+
+        foreach (glob(\dirname($globPattern) . '/*', \GLOB_ONLYDIR | \GLOB_NOSORT) as $dir) {
+            // Unpacking the argument via ... is supported starting from php 5.6 only
+            /** @noinspection SlowArrayOperationsInLoopInspection */
             $files = array_merge($files, self::globFileSearch($dir . '/' . basename($globPattern), $flags, $recursive));
         }
+
         return $files;
     }
 
@@ -185,38 +209,70 @@ class FilesUtil
      *
      * @param string $folder
      * @param string $pattern
-     * @param bool $recursive
+     * @param bool   $recursive
+     *
      * @return array Searched file list
      */
     public static function regexFileSearch($folder, $pattern, $recursive = true)
     {
         $directoryIterator = $recursive ? new \RecursiveDirectoryIterator($folder) : new \DirectoryIterator($folder);
-        $iterator = $recursive ? new \RecursiveIteratorIterator($directoryIterator) : new \IteratorIterator($directoryIterator);
+        $iterator = $recursive ? new \RecursiveIteratorIterator($directoryIterator) : new \IteratorIterator(
+            $directoryIterator
+        );
         $regexIterator = new \RegexIterator($iterator, $pattern, \RegexIterator::MATCH);
         $fileList = [];
+
         foreach ($regexIterator as $file) {
             if ($file instanceof \SplFileInfo) {
                 $fileList[] = $file->getPathname();
             }
         }
+
         return $fileList;
     }
 
     /**
      * Convert bytes to human size.
      *
-     * @param int $size Size bytes
+     * @param int         $size Size bytes
      * @param string|null $unit Unit support 'GB', 'MB', 'KB'
+     *
      * @return string
      */
     public static function humanSize($size, $unit = null)
     {
-        if (($unit === null && $size >= 1 << 30) || $unit === "GB")
-            return number_format($size / (1 << 30), 2) . "GB";
-        if (($unit === null && $size >= 1 << 20) || $unit === "MB")
-            return number_format($size / (1 << 20), 2) . "MB";
-        if (($unit === null && $size >= 1 << 10) || $unit === "KB")
-            return number_format($size / (1 << 10), 2) . "KB";
-        return number_format($size) . " bytes";
+        if (($unit === null && $size >= 1 << 30) || $unit === 'GB') {
+            return number_format($size / (1 << 30), 2) . 'GB';
+        }
+
+        if (($unit === null && $size >= 1 << 20) || $unit === 'MB') {
+            return number_format($size / (1 << 20), 2) . 'MB';
+        }
+
+        if (($unit === null && $size >= 1 << 10) || $unit === 'KB') {
+            return number_format($size / (1 << 10), 2) . 'KB';
+        }
+
+        return number_format($size) . ' bytes';
     }
-}
+
+    /**
+     * Normalizes zip path.
+     *
+     * @param string $path Zip path
+     *
+     * @return string
+     */
+    public static function normalizeZipPath($path)
+    {
+        return implode(
+            '/',
+            array_filter(
+                explode('/', (string) $path),
+                static function ($part) {
+                    return $part !== '.' && $part !== '..';
+                }
+            )
+        );
+    }
+}

src/PhpZip/Util/Iterator/IgnoreFilesFilterIterator.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util\Iterator;
 
 use PhpZip\Util\StringUtil;
@@ -12,7 +13,7 @@ use PhpZip\Util\StringUtil;
 class IgnoreFilesFilterIterator extends \FilterIterator
 {
     /**
-     * Ignore list files
+     * Ignore list files.
      *
      * @var array
      */
@@ -20,7 +21,7 @@ class IgnoreFilesFilterIterator extends \FilterIterator
 
     /**
      * @param \Iterator $iterator
-     * @param array $ignoreFiles
+     * @param array     $ignoreFiles
      */
     public function __construct(\Iterator $iterator, array $ignoreFiles)
     {
@@ -29,9 +30,12 @@ class IgnoreFilesFilterIterator extends \FilterIterator
     }
 
     /**
-     * Check whether the current element of the iterator is acceptable
-     * @link http://php.net/manual/en/filteriterator.accept.php
-     * @return bool true if the current element is acceptable, otherwise false.
+     * Check whether the current element of the iterator is acceptable.
+     *
+     * @see http://php.net/manual/en/filteriterator.accept.php
+     *
+     * @return bool true if the current element is acceptable, otherwise false
+     *
      * @since 5.1.0
      */
     public function accept()
@@ -41,10 +45,11 @@ class IgnoreFilesFilterIterator extends \FilterIterator
          */
         $fileInfo = $this->current();
         $pathname = str_replace('\\', '/', $fileInfo->getPathname());
+
         foreach ($this->ignoreFiles as $ignoreFile) {
             // handler dir and sub dir
             if ($fileInfo->isDir()
-                && $ignoreFile[strlen($ignoreFile) - 1] === '/'
+                && StringUtil::endsWith($ignoreFile, '/')
                 && StringUtil::endsWith($pathname, substr($ignoreFile, 0, -1))
             ) {
                 return false;
@@ -55,6 +60,7 @@ class IgnoreFilesFilterIterator extends \FilterIterator
                 return false;
             }
         }
+
         return true;
     }
-}
+}

src/PhpZip/Util/Iterator/IgnoreFilesRecursiveFilterIterator.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util\Iterator;
 
 use PhpZip\Util\StringUtil;
@@ -11,9 +12,8 @@ use PhpZip\Util\StringUtil;
  */
 class IgnoreFilesRecursiveFilterIterator extends \RecursiveFilterIterator
 {
-
     /**
-     * Ignore list files
+     * Ignore list files.
      *
      * @var array
      */
@@ -21,7 +21,7 @@ class IgnoreFilesRecursiveFilterIterator extends \RecursiveFilterIterator
 
     /**
      * @param \RecursiveIterator $iterator
-     * @param array $ignoreFiles
+     * @param array              $ignoreFiles
      */
     public function __construct(\RecursiveIterator $iterator, array $ignoreFiles)
     {
@@ -30,9 +30,12 @@ class IgnoreFilesRecursiveFilterIterator extends \RecursiveFilterIterator
     }
 
     /**
-     * Check whether the current element of the iterator is acceptable
-     * @link http://php.net/manual/en/filteriterator.accept.php
-     * @return bool true if the current element is acceptable, otherwise false.
+     * Check whether the current element of the iterator is acceptable.
+     *
+     * @see http://php.net/manual/en/filteriterator.accept.php
+     *
+     * @return bool true if the current element is acceptable, otherwise false
+     *
      * @since 5.1.0
      */
     public function accept()
@@ -42,10 +45,11 @@ class IgnoreFilesRecursiveFilterIterator extends \RecursiveFilterIterator
          */
         $fileInfo = $this->current();
         $pathname = str_replace('\\', '/', $fileInfo->getPathname());
+
         foreach ($this->ignoreFiles as $ignoreFile) {
             // handler dir and sub dir
             if ($fileInfo->isDir()
-                && $ignoreFile[strlen($ignoreFile) - 1] === '/'
+                && $ignoreFile[\strlen($ignoreFile) - 1] === '/'
                 && StringUtil::endsWith($pathname, substr($ignoreFile, 0, -1))
             ) {
                 return false;
@@ -56,14 +60,16 @@ class IgnoreFilesRecursiveFilterIterator extends \RecursiveFilterIterator
                 return false;
             }
         }
+
         return true;
     }
 
     /**
      * @return IgnoreFilesRecursiveFilterIterator
+     * @noinspection PhpMissingParentCallCommonInspection
      */
     public function getChildren()
     {
         return new self($this->getInnerIterator()->getChildren(), $this->ignoreFiles);
     }
-}
+}

src/PhpZip/Util/PackUtil.php

@@ -1,25 +1,26 @@
 <?php
+
 namespace PhpZip\Util;
 
-use PhpZip\Exception\ZipException;
-
 /**
- * Pack util
+ * Pack util.
  *
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
+ *
+ * @internal
  */
-class PackUtil
+final class PackUtil
 {
-
     /**
      * @param int|string $longValue
+     *
      * @return string
      */
     public static function packLongLE($longValue)
     {
-        if (version_compare(PHP_VERSION, '5.6.3') >= 0) {
-            return pack("P", $longValue);
+        if (\PHP_INT_SIZE === 8 && \PHP_VERSION_ID >= 506030) {
+            return pack('P', $longValue);
         }
 
         $left = 0xffffffff00000000;
@@ -33,16 +34,36 @@ class PackUtil
 
     /**
      * @param string|int $value
+     *
      * @return int
-     * @throws ZipException
      */
     public static function unpackLongLE($value)
     {
-        if (version_compare(PHP_VERSION, '5.6.3') >= 0) {
-            return current(unpack('P', $value));
+        if (\PHP_INT_SIZE === 8 && \PHP_VERSION_ID >= 506030) {
+            return unpack('P', $value)[1];
         }
         $unpack = unpack('Va/Vb', $value);
+
         return $unpack['a'] + ($unpack['b'] << 32);
     }
 
-}
+    /**
+     * Cast to signed int 32-bit.
+     *
+     * @param int $int
+     *
+     * @return int
+     */
+    public static function toSignedInt32($int)
+    {
+        if (\PHP_INT_SIZE === 8) {
+            $int &= 0xffffffff;
+
+            if ($int & 0x80000000) {
+                return $int - 0x100000000;
+            }
+        }
+
+        return $int;
+    }
+}

src/PhpZip/Util/StringUtil.php

@@ -1,30 +1,34 @@
 <?php
+
 namespace PhpZip\Util;
 
 /**
- * String Util
+ * String Util.
+ *
+ * @internal
  */
-class StringUtil
+final class StringUtil
 {
-
     /**
      * @param string $haystack
      * @param string $needle
+     *
      * @return bool
      */
     public static function startsWith($haystack, $needle)
     {
-        return $needle === "" || strrpos($haystack, $needle, -strlen($haystack)) !== false;
+        return $needle === '' || strrpos($haystack, $needle, -\strlen($haystack)) !== false;
     }
 
     /**
      * @param string $haystack
      * @param string $needle
+     *
      * @return bool
      */
     public static function endsWith($haystack, $needle)
     {
-        return $needle === "" || (($temp = strlen($haystack) - strlen($needle)) >= 0
-            && strpos($haystack, $needle, $temp) !== false);
+        return $needle === '' || (($temp = \strlen($haystack) - \strlen($needle)) >= 0
+                && strpos($haystack, $needle, $temp) !== false);
     }
-}
+}

src/PhpZip/ZipFileInterface.php

@@ -0,0 +1,686 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipEntryNotFoundException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Model\ZipEntry;
+use PhpZip\Model\ZipEntryMatcher;
+use PhpZip\Model\ZipInfo;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Create, open .ZIP files, modify, get info and extract files.
+ *
+ * Implemented support traditional PKWARE encryption and WinZip AES encryption.
+ * Implemented support ZIP64.
+ * Implemented support skip a preamble like the one found in self extracting archives.
+ * Support ZipAlign functional.
+ *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+interface ZipFileInterface extends \Countable, \ArrayAccess, \Iterator
+{
+    /**
+     * Method for Stored (uncompressed) entries.
+     *
+     * @see ZipEntry::setMethod()
+     */
+    const METHOD_STORED = 0;
+
+    /**
+     * Method for Deflated compressed entries.
+     *
+     * @see ZipEntry::setMethod()
+     */
+    const METHOD_DEFLATED = 8;
+
+    /**
+     * Method for BZIP2 compressed entries.
+     * Require php extension bz2.
+     *
+     * @see ZipEntry::setMethod()
+     */
+    const METHOD_BZIP2 = 12;
+
+    /** Default compression level. */
+    const LEVEL_DEFAULT_COMPRESSION = -1;
+
+    /** Compression level for fastest compression. */
+    const LEVEL_FAST = 2;
+
+    /** Compression level for fastest compression. */
+    const LEVEL_BEST_SPEED = 1;
+
+    const LEVEL_SUPER_FAST = self::LEVEL_BEST_SPEED;
+
+    /** Compression level for best compression. */
+    const LEVEL_BEST_COMPRESSION = 9;
+
+    /** No specified method for set encryption method to Traditional PKWARE encryption. */
+    const ENCRYPTION_METHOD_TRADITIONAL = 0;
+
+    /**
+     * No specified method for set encryption method to WinZip AES encryption.
+     * Default value 256 bit.
+     */
+    const ENCRYPTION_METHOD_WINZIP_AES = self::ENCRYPTION_METHOD_WINZIP_AES_256;
+
+    /** No specified method for set encryption method to WinZip AES encryption 128 bit. */
+    const ENCRYPTION_METHOD_WINZIP_AES_128 = 2;
+
+    /** No specified method for set encryption method to WinZip AES encryption 194 bit. */
+    const ENCRYPTION_METHOD_WINZIP_AES_192 = 3;
+
+    /** No specified method for set encryption method to WinZip AES encryption 256 bit. */
+    const ENCRYPTION_METHOD_WINZIP_AES_256 = 1;
+
+    /**
+     * Open zip archive from file.
+     *
+     * @param string $filename
+     *
+     * @throws ZipException if can't open file
+     *
+     * @return ZipFileInterface
+     */
+    public function openFile($filename);
+
+    /**
+     * Open zip archive from raw string data.
+     *
+     * @param string $data
+     *
+     * @throws ZipException if can't open temp stream
+     *
+     * @return ZipFileInterface
+     */
+    public function openFromString($data);
+
+    /**
+     * Open zip archive from stream resource.
+     *
+     * @param resource $handle
+     *
+     * @return ZipFileInterface
+     */
+    public function openFromStream($handle);
+
+    /**
+     * @return string[] returns the list files
+     */
+    public function getListFiles();
+
+    /**
+     * Returns the file comment.
+     *
+     * @return string the file comment
+     */
+    public function getArchiveComment();
+
+    /**
+     * Set archive comment.
+     *
+     * @param string|null $comment
+     *
+     * @return ZipFileInterface
+     */
+    public function setArchiveComment($comment = null);
+
+    /**
+     * Checks that the entry in the archive is a directory.
+     * Returns true if and only if this ZIP entry represents a directory entry
+     * (i.e. end with '/').
+     *
+     * @param string $entryName
+     *
+     * @throws ZipEntryNotFoundException
+     *
+     * @return bool
+     */
+    public function isDirectory($entryName);
+
+    /**
+     * Returns entry comment.
+     *
+     * @param string $entryName
+     *
+     * @throws ZipEntryNotFoundException
+     *
+     * @return string
+     */
+    public function getEntryComment($entryName);
+
+    /**
+     * Set entry comment.
+     *
+     * @param string      $entryName
+     * @param string|null $comment
+     *
+     * @throws ZipEntryNotFoundException
+     *
+     * @return ZipFileInterface
+     */
+    public function setEntryComment($entryName, $comment = null);
+
+    /**
+     * Returns the entry contents.
+     *
+     * @param string $entryName
+     *
+     * @return string
+     */
+    public function getEntryContents($entryName);
+
+    /**
+     * Checks if there is an entry in the archive.
+     *
+     * @param string $entryName
+     *
+     * @return bool
+     */
+    public function hasEntry($entryName);
+
+    /**
+     * Get info by entry.
+     *
+     * @param string|ZipEntry $entryName
+     *
+     * @throws ZipEntryNotFoundException
+     *
+     * @return ZipInfo
+     */
+    public function getEntryInfo($entryName);
+
+    /**
+     * Get info by all entries.
+     *
+     * @return ZipInfo[]
+     */
+    public function getAllInfo();
+
+    /**
+     * @return ZipEntryMatcher
+     */
+    public function matcher();
+
+    /**
+     * Extract the archive contents.
+     *
+     * Extract the complete archive or the given files to the specified destination.
+     *
+     * @param string            $destination location where to extract the files
+     * @param array|string|null $entries     The entries to extract. It accepts either
+     *                                       a single entry name or an array of names.
+     *
+     * @throws ZipException
+     *
+     * @return ZipFileInterface
+     */
+    public function extractTo($destination, $entries = null);
+
+    /**
+     * Add entry from the string.
+     *
+     * @param string   $localName         zip entry name
+     * @param string   $contents          string contents
+     * @param int|null $compressionMethod Compression method.
+     *                                    Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or ZipFile::METHOD_BZIP2.
+     *                                    If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::METHOD_STORED
+     * @see ZipFile::METHOD_DEFLATED
+     * @see ZipFile::METHOD_BZIP2
+     */
+    public function addFromString($localName, $contents, $compressionMethod = null);
+
+    /**
+     * Add entry from the file.
+     *
+     * @param string      $filename          destination file
+     * @param string|null $localName         zip Entry name
+     * @param int|null    $compressionMethod Compression method.
+     *                                       Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or
+     *                                       ZipFile::METHOD_BZIP2. If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::METHOD_STORED
+     * @see ZipFile::METHOD_DEFLATED
+     * @see ZipFile::METHOD_BZIP2
+     */
+    public function addFile($filename, $localName = null, $compressionMethod = null);
+
+    /**
+     * Add entry from the stream.
+     *
+     * @param resource $stream            stream resource
+     * @param string   $localName         zip Entry name
+     * @param int|null $compressionMethod Compression method.
+     *                                    Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or ZipFile::METHOD_BZIP2.
+     *                                    If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::METHOD_STORED
+     * @see ZipFile::METHOD_DEFLATED
+     * @see ZipFile::METHOD_BZIP2
+     */
+    public function addFromStream($stream, $localName, $compressionMethod = null);
+
+    /**
+     * Add an empty directory in the zip archive.
+     *
+     * @param string $dirName
+     *
+     * @return ZipFileInterface
+     */
+    public function addEmptyDir($dirName);
+
+    /**
+     * Add directory not recursively to the zip archive.
+     *
+     * @param string   $inputDir          Input directory
+     * @param string   $localPath         add files to this directory, or the root
+     * @param int|null $compressionMethod Compression method.
+     *                                    Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or ZipFile::METHOD_BZIP2.
+     *                                    If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     */
+    public function addDir($inputDir, $localPath = '/', $compressionMethod = null);
+
+    /**
+     * Add recursive directory to the zip archive.
+     *
+     * @param string   $inputDir          Input directory
+     * @param string   $localPath         add files to this directory, or the root
+     * @param int|null $compressionMethod Compression method.
+     *                                    Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or ZipFile::METHOD_BZIP2.
+     *                                    If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::METHOD_STORED
+     * @see ZipFile::METHOD_DEFLATED
+     * @see ZipFile::METHOD_BZIP2
+     */
+    public function addDirRecursive($inputDir, $localPath = '/', $compressionMethod = null);
+
+    /**
+     * Add directories from directory iterator.
+     *
+     * @param \Iterator $iterator          directory iterator
+     * @param string    $localPath         add files to this directory, or the root
+     * @param int|null  $compressionMethod Compression method.
+     *                                     Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or
+     *                                     ZipFile::METHOD_BZIP2. If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::METHOD_STORED
+     * @see ZipFile::METHOD_DEFLATED
+     * @see ZipFile::METHOD_BZIP2
+     */
+    public function addFilesFromIterator(\Iterator $iterator, $localPath = '/', $compressionMethod = null);
+
+    /**
+     * Add files from glob pattern.
+     *
+     * @param string      $inputDir          Input directory
+     * @param string      $globPattern       glob pattern
+     * @param string|null $localPath         add files to this directory, or the root
+     * @param int|null    $compressionMethod Compression method.
+     *                                       Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or
+     *                                       ZipFile::METHOD_BZIP2. If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     * @sse https://en.wikipedia.org/wiki/Glob_(programming) Glob pattern syntax
+     */
+    public function addFilesFromGlob($inputDir, $globPattern, $localPath = '/', $compressionMethod = null);
+
+    /**
+     * Add files recursively from glob pattern.
+     *
+     * @param string      $inputDir          Input directory
+     * @param string      $globPattern       glob pattern
+     * @param string|null $localPath         add files to this directory, or the root
+     * @param int|null    $compressionMethod Compression method.
+     *                                       Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or
+     *                                       ZipFile::METHOD_BZIP2. If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     * @sse https://en.wikipedia.org/wiki/Glob_(programming) Glob pattern syntax
+     */
+    public function addFilesFromGlobRecursive($inputDir, $globPattern, $localPath = '/', $compressionMethod = null);
+
+    /**
+     * Add files from regex pattern.
+     *
+     * @param string      $inputDir          search files in this directory
+     * @param string      $regexPattern      regex pattern
+     * @param string|null $localPath         add files to this directory, or the root
+     * @param int|null    $compressionMethod Compression method.
+     *                                       Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or
+     *                                       ZipFile::METHOD_BZIP2. If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     *
+     * @internal param bool $recursive Recursive search
+     */
+    public function addFilesFromRegex($inputDir, $regexPattern, $localPath = '/', $compressionMethod = null);
+
+    /**
+     * Add files recursively from regex pattern.
+     *
+     * @param string      $inputDir          search files in this directory
+     * @param string      $regexPattern      regex pattern
+     * @param string|null $localPath         add files to this directory, or the root
+     * @param int|null    $compressionMethod Compression method.
+     *                                       Use ZipFile::METHOD_STORED, ZipFile::METHOD_DEFLATED or
+     *                                       ZipFile::METHOD_BZIP2. If null, then auto choosing method.
+     *
+     * @return ZipFileInterface
+     *
+     * @internal param bool $recursive Recursive search
+     */
+    public function addFilesFromRegexRecursive($inputDir, $regexPattern, $localPath = '/', $compressionMethod = null);
+
+    /**
+     * Add array data to archive.
+     * Keys is local names.
+     * Values is contents.
+     *
+     * @param array $mapData associative array for added to zip
+     */
+    public function addAll(array $mapData);
+
+    /**
+     * Rename the entry.
+     *
+     * @param string $oldName old entry name
+     * @param string $newName new entry name
+     *
+     * @throws ZipEntryNotFoundException
+     *
+     * @return ZipFileInterface
+     */
+    public function rename($oldName, $newName);
+
+    /**
+     * Delete entry by name.
+     *
+     * @param string $entryName zip Entry name
+     *
+     * @throws ZipEntryNotFoundException if entry not found
+     *
+     * @return ZipFileInterface
+     */
+    public function deleteFromName($entryName);
+
+    /**
+     * Delete entries by glob pattern.
+     *
+     * @param string $globPattern Glob pattern
+     *
+     * @return ZipFileInterface
+     * @sse https://en.wikipedia.org/wiki/Glob_(programming) Glob pattern syntax
+     */
+    public function deleteFromGlob($globPattern);
+
+    /**
+     * Delete entries by regex pattern.
+     *
+     * @param string $regexPattern Regex pattern
+     *
+     * @return ZipFileInterface
+     */
+    public function deleteFromRegex($regexPattern);
+
+    /**
+     * Delete all entries.
+     *
+     * @return ZipFileInterface
+     */
+    public function deleteAll();
+
+    /**
+     * Set compression level for new entries.
+     *
+     * @param int $compressionLevel
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::LEVEL_SUPER_FAST
+     * @see ZipFile::LEVEL_FAST
+     * @see ZipFile::LEVEL_BEST_COMPRESSION
+     * @see ZipFile::LEVEL_DEFAULT_COMPRESSION
+     */
+    public function setCompressionLevel($compressionLevel = self::LEVEL_DEFAULT_COMPRESSION);
+
+    /**
+     * @param string $entryName
+     * @param int    $compressionLevel
+     *
+     * @throws ZipException
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::LEVEL_DEFAULT_COMPRESSION
+     * @see ZipFile::LEVEL_SUPER_FAST
+     * @see ZipFile::LEVEL_FAST
+     * @see ZipFile::LEVEL_BEST_COMPRESSION
+     */
+    public function setCompressionLevelEntry($entryName, $compressionLevel);
+
+    /**
+     * @param string $entryName
+     * @param int    $compressionMethod
+     *
+     * @throws ZipException
+     *
+     * @return ZipFileInterface
+     *
+     * @see ZipFile::METHOD_STORED
+     * @see ZipFile::METHOD_DEFLATED
+     * @see ZipFile::METHOD_BZIP2
+     */
+    public function setCompressionMethodEntry($entryName, $compressionMethod);
+
+    /**
+     * zipalign is optimization to Android application (APK) files.
+     *
+     * @param int|null $align
+     *
+     * @return ZipFileInterface
+     *
+     * @see https://developer.android.com/studio/command-line/zipalign.html
+     */
+    public function setZipAlign($align = null);
+
+    /**
+     * Set password to all input encrypted entries.
+     *
+     * @param string $password Password
+     *
+     * @return ZipFileInterface
+     *
+     * @deprecated using ZipFile::setReadPassword()
+     */
+    public function withReadPassword($password);
+
+    /**
+     * Set password to all input encrypted entries.
+     *
+     * @param string $password Password
+     *
+     * @return ZipFileInterface
+     */
+    public function setReadPassword($password);
+
+    /**
+     * Set password to concrete input entry.
+     *
+     * @param string $entryName
+     * @param string $password  Password
+     *
+     * @return ZipFileInterface
+     */
+    public function setReadPasswordEntry($entryName, $password);
+
+    /**
+     * Set password for all entries for update.
+     *
+     * @param string   $password         If password null then encryption clear
+     * @param int|null $encryptionMethod Encryption method
+     *
+     * @return ZipFileInterface
+     *
+     * @deprecated using ZipFile::setPassword()
+     */
+    public function withNewPassword($password, $encryptionMethod = self::ENCRYPTION_METHOD_WINZIP_AES_256);
+
+    /**
+     * Sets a new password for all files in the archive.
+     *
+     * @param string   $password
+     * @param int|null $encryptionMethod Encryption method
+     *
+     * @return ZipFileInterface
+     */
+    public function setPassword($password, $encryptionMethod = self::ENCRYPTION_METHOD_WINZIP_AES_256);
+
+    /**
+     * Sets a new password of an entry defined by its name.
+     *
+     * @param string   $entryName
+     * @param string   $password
+     * @param int|null $encryptionMethod
+     *
+     * @return ZipFileInterface
+     */
+    public function setPasswordEntry($entryName, $password, $encryptionMethod = null);
+
+    /**
+     * Remove password for all entries for update.
+     *
+     * @return ZipFileInterface
+     *
+     * @deprecated using ZipFile::disableEncryption()
+     */
+    public function withoutPassword();
+
+    /**
+     * Disable encryption for all entries that are already in the archive.
+     *
+     * @return ZipFileInterface
+     */
+    public function disableEncryption();
+
+    /**
+     * Disable encryption of an entry defined by its name.
+     *
+     * @param string $entryName
+     *
+     * @return ZipFileInterface
+     */
+    public function disableEncryptionEntry($entryName);
+
+    /**
+     * Undo all changes done in the archive.
+     *
+     * @return ZipFileInterface
+     */
+    public function unchangeAll();
+
+    /**
+     * Undo change archive comment.
+     *
+     * @return ZipFileInterface
+     */
+    public function unchangeArchiveComment();
+
+    /**
+     * Revert all changes done to an entry with the given name.
+     *
+     * @param string|ZipEntry $entry Entry name or ZipEntry
+     *
+     * @return ZipFileInterface
+     */
+    public function unchangeEntry($entry);
+
+    /**
+     * Save as file.
+     *
+     * @param string $filename Output filename
+     *
+     * @throws ZipException
+     *
+     * @return ZipFileInterface
+     */
+    public function saveAsFile($filename);
+
+    /**
+     * Save as stream.
+     *
+     * @param resource $handle Output stream resource
+     *
+     * @throws ZipException
+     *
+     * @return ZipFileInterface
+     */
+    public function saveAsStream($handle);
+
+    /**
+     * Output .ZIP archive as attachment.
+     * Die after output.
+     *
+     * @param string      $outputFilename Output filename
+     * @param string|null $mimeType       Mime-Type
+     * @param bool        $attachment     Http Header 'Content-Disposition' if true then attachment otherwise inline
+     */
+    public function outputAsAttachment($outputFilename, $mimeType = null, $attachment = true);
+
+    /**
+     * Output .ZIP archive as PSR-7 Response.
+     *
+     * @param ResponseInterface $response       Instance PSR-7 Response
+     * @param string            $outputFilename Output filename
+     * @param string|null       $mimeType       Mime-Type
+     * @param bool              $attachment     Http Header 'Content-Disposition' if true then attachment otherwise inline
+     *
+     * @return ResponseInterface
+     */
+    public function outputAsResponse(
+        ResponseInterface $response,
+        $outputFilename,
+        $mimeType = null,
+        $attachment = true
+    );
+
+    /**
+     * Returns the zip archive as a string.
+     *
+     * @return string
+     */
+    public function outputAsString();
+
+    /**
+     * Save and reopen zip archive.
+     *
+     * @throws ZipException
+     *
+     * @return ZipFileInterface
+     */
+    public function rewrite();
+
+    /**
+     * Close zip archive and release input stream.
+     */
+    public function close();
+}

tests/PhpZip/Internal/DummyFileSystemStream.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace PhpZip\Internal;
+
+/**
+ * Try to load using dummy stream.
+ */
+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)
+    {
+        $parsedUrl = parse_url($path);
+        $path = $parsedUrl['path'];
+        $this->fp = fopen($path, $mode);
+
+        return true;
+    }
+
+    /**
+     * @param $count
+     *
+     * @return false|string
+     */
+    public function stream_read($count)
+    {
+        return fread($this->fp, $count);
+    }
+
+    /**
+     * @return false|int
+     */
+    public function stream_tell()
+    {
+        return ftell($this->fp);
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        return feof($this->fp);
+    }
+
+    /**
+     * @param $offset
+     * @param $whence
+     */
+    public function stream_seek($offset, $whence)
+    {
+        fseek($this->fp, $offset, $whence);
+    }
+
+    /**
+     * @return array
+     */
+    public function stream_stat()
+    {
+        return fstat($this->fp);
+    }
+}

tests/PhpZip/Internal/ZipFileExtended.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace PhpZip\Internal;
+
+use PhpZip\ZipFile;
+
+/**
+ * Class ZipFileExtended.
+ */
+class ZipFileExtended extends ZipFile
+{
+    protected function onBeforeSave()
+    {
+        parent::onBeforeSave();
+        $this->setZipAlign(4);
+        $this->deleteFromRegex('~^META\-INF/~i');
+    }
+}

tests/PhpZip/Issue24Test.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipException;
+
+/**
+ * @internal
+ *
+ * @small
+ */
+class Issue24Test extends ZipTestCase
+{
+    /**
+     * This method is called before the first test of this test class is run.
+     *
+     * @noinspection PhpMissingParentCallCommonInspection
+     */
+    public static function setUpBeforeClass()
+    {
+        stream_wrapper_register('dummyfs', Internal\DummyFileSystemStream::class);
+    }
+
+    /**
+     * @throws ZipException
+     * @throws \Exception
+     */
+    public function testDummyFS()
+    {
+        $fileContents = str_repeat(base64_encode(random_bytes(12000)), 100);
+
+        // create zip file
+        $zip = new ZipFile();
+        $zip->addFromString(
+            'file.txt',
+            $fileContents,
+            ZipFile::METHOD_DEFLATED
+        );
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $stream = fopen('dummyfs://localhost/' . $this->outputFilename, 'rb');
+        static::assertNotFalse($stream);
+        $zip->openFromStream($stream);
+        static::assertSame($zip->getListFiles(), ['file.txt']);
+        static::assertSame($zip['file.txt'], $fileContents);
+        $zip->close();
+    }
+}

tests/PhpZip/PhpZipExtResourceTest.php

@@ -0,0 +1,176 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\Crc32Exception;
+use PhpZip\Exception\RuntimeException;
+use PhpZip\Exception\ZipAuthenticationException;
+use PhpZip\Exception\ZipException;
+
+/**
+ * Some tests from the official extension of php-zip.
+ *
+ * @internal
+ *
+ * @small
+ */
+class PhpZipExtResourceTest extends ZipTestCase
+{
+    /**
+     * Bug #7214 (zip_entry_read() binary safe).
+     *
+     * @see https://github.com/php/php-src/blob/master/ext/zip/tests/bug7214.phpt
+     *
+     * @throws ZipException
+     */
+    public function testBinaryNull()
+    {
+        $filename = __DIR__ . '/php-zip-ext-test-resources/binarynull.zip';
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+
+        foreach ($zipFile as $name => $contents) {
+            $info = $zipFile->getEntryInfo($name);
+            static::assertSame(\strlen($contents), $info->getSize());
+        }
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($filename);
+    }
+
+    /**
+     * Bug #8009 (cannot add again same entry to an archive).
+     *
+     * @see https://github.com/php/php-src/blob/master/ext/zip/tests/bug8009.phpt
+     *
+     * @throws ZipException
+     */
+    public function testBug8009()
+    {
+        $filename = __DIR__ . '/php-zip-ext-test-resources/bug8009.zip';
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->addFromString('2.txt', '=)');
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertCount(2, $zipFile);
+        static::assertTrue(isset($zipFile['1.txt']));
+        static::assertTrue(isset($zipFile['2.txt']));
+        static::assertSame($zipFile['2.txt'], $zipFile['1.txt']);
+        $zipFile->close();
+    }
+
+    /**
+     * Bug #40228 (extractTo does not create recursive empty path).
+     *
+     * @see https://github.com/php/php-src/blob/master/ext/zip/tests/bug40228.phpt
+     * @see https://github.com/php/php-src/blob/master/ext/zip/tests/bug40228-mb.phpt
+     * @dataProvider provideBug40228
+     *
+     * @param string $filename
+     *
+     * @throws ZipException
+     */
+    public function testBug40228($filename)
+    {
+        static::assertTrue(mkdir($this->outputDirname, 0755, true));
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->extractTo($this->outputDirname);
+        $zipFile->close();
+
+        static::assertTrue(is_dir($this->outputDirname . '/test/empty'));
+    }
+
+    /**
+     * @return array
+     */
+    public function provideBug40228()
+    {
+        return [
+            [__DIR__ . '/php-zip-ext-test-resources/bug40228.zip'],
+        ];
+    }
+
+    /**
+     * Bug #49072 (feof never returns true for damaged file in zip).
+     *
+     * @see https://github.com/php/php-src/blob/master/ext/zip/tests/bug49072.phpt
+     *
+     * @throws ZipException
+     */
+    public function testBug49072()
+    {
+        $this->setExpectedException(Crc32Exception::class, 'file1');
+
+        $filename = __DIR__ . '/php-zip-ext-test-resources/bug49072.zip';
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->getEntryContents('file1');
+    }
+
+    /**
+     * Bug #70752 (Depacking with wrong password leaves 0 length files).
+     *
+     * @see https://github.com/php/php-src/blob/master/ext/zip/tests/bug70752.phpt
+     *
+     * @throws ZipException
+     */
+    public function testBug70752()
+    {
+        if (\PHP_INT_SIZE === 4) { // php 32 bit
+            $this->setExpectedException(
+                RuntimeException::class,
+                'Traditional PKWARE Encryption is not supported in 32-bit PHP.'
+            );
+        } else { // php 64 bit
+            $this->setExpectedException(
+                ZipAuthenticationException::class,
+                'nvalid password for zip entry "bug70752.txt"'
+            );
+        }
+
+        $filename = __DIR__ . '/php-zip-ext-test-resources/bug70752.zip';
+
+        static::assertTrue(mkdir($this->outputDirname, 0755, true));
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->setReadPassword('bar');
+
+        try {
+            $zipFile->extractTo($this->outputDirname);
+            static::markTestIncomplete('failed test');
+        } catch (ZipException $exception) {
+            static::assertFileNotExists($this->outputDirname . '/bug70752.txt');
+            $zipFile->close();
+
+            throw $exception;
+        }
+    }
+
+    /**
+     * Bug #12414 ( extracting files from damaged archives).
+     *
+     * @see https://github.com/php/php-src/blob/master/ext/zip/tests/pecl12414.phpt
+     *
+     * @throws ZipException
+     */
+    public function testPecl12414()
+    {
+        $this->setExpectedException(ZipException::class, 'Corrupt zip file. Cannot read central dir entry.');
+
+        $filename = __DIR__ . '/php-zip-ext-test-resources/pecl12414.zip';
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+    }
+}

tests/PhpZip/Zip64Test.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipException;
+
+/**
+ * @internal
+ *
+ * @large
+ */
+class Zip64Test extends ZipTestCase
+{
+    /**
+     * Test support ZIP64 ext (slow test - normal).
+     * Create > 65535 files in archive and open and extract to /dev/null.
+     *
+     * @throws ZipException
+     */
+    public function testCreateAndOpenZip64Ext()
+    {
+        $countFiles = 0xffff + 1;
+
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < $countFiles; $i++) {
+            $zipFile[$i . '.txt'] = (string) $i;
+        }
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertSame($zipFile->count(), $countFiles);
+        $i = 0;
+
+        foreach ($zipFile as $entry => $content) {
+            static::assertSame($entry, $i . '.txt');
+            static::assertSame($content, (string) $i);
+            $i++;
+        }
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipAlignTest.php

@@ -0,0 +1,170 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipException;
+
+/**
+ * Test ZipAlign.
+ *
+ * @internal
+ *
+ * @small
+ */
+class ZipAlignTest extends ZipTestCase
+{
+    /**
+     * @throws ZipException
+     */
+    public function testApkAlignedAndSetZipAlignAndReSave()
+    {
+        $filename = __DIR__ . '/resources/apk.zip';
+
+        static::assertCorrectZipArchive($filename);
+        $result = static::assertVerifyZipAlign($filename);
+
+        if ($result !== null) {
+            static::assertTrue($result);
+        }
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+        $result = static::assertVerifyZipAlign($this->outputFilename, true);
+
+        if ($result !== null) {
+            static::assertTrue($result);
+        }
+    }
+
+    /**
+     * Test zip alignment.
+     *
+     * @throws ZipException
+     * @throws \Exception
+     */
+    public function testZipAlignSourceZip()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile->addFromString(
+                'entry' . $i . '.txt',
+                random_bytes(mt_rand(100, 4096)),
+                ZipFile::METHOD_STORED
+            );
+        }
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $result = static::assertVerifyZipAlign($this->outputFilename);
+
+        if ($result === null) {
+            return;
+        } // zip align not installed
+
+        // check not zip align
+        static::assertFalse($result);
+
+        $zipFile->openFile($this->outputFilename);
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $result = static::assertVerifyZipAlign($this->outputFilename, true);
+        static::assertNotNull($result);
+
+        // check zip align
+        static::assertTrue($result);
+    }
+
+    /**
+     * @throws ZipException
+     * @throws \Exception
+     */
+    public function testZipAlignNewFiles()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile->addFromString(
+                'entry' . $i . '.txt',
+                random_bytes(mt_rand(100, 4096)),
+                ZipFile::METHOD_STORED
+            );
+        }
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $result = static::assertVerifyZipAlign($this->outputFilename);
+
+        if ($result === null) {
+            return;
+        } // zip align not installed
+        // check not zip align
+        static::assertTrue($result);
+    }
+
+    /**
+     * @throws ZipException
+     * @throws \Exception
+     */
+    public function testZipAlignFromModifiedZipArchive()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile->addFromString(
+                'entry' . $i . '.txt',
+                random_bytes(mt_rand(100, 4096)),
+                ZipFile::METHOD_STORED
+            );
+        }
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $result = static::assertVerifyZipAlign($this->outputFilename);
+
+        if ($result === null) {
+            return;
+        } // zip align not installed
+
+        // check not zip align
+        static::assertFalse($result);
+
+        $zipFile->openFile($this->outputFilename);
+        $zipFile->deleteFromRegex('~entry2[\\d]+\\.txt$~s');
+        for ($i = 0; $i < 100; $i++) {
+            $isStored = (bool) mt_rand(0, 1);
+
+            $zipFile->addFromString(
+                'entry_new_' . ($isStored ? 'stored' : 'deflated') . '_' . $i . '.txt',
+                random_bytes(mt_rand(100, 4096)),
+                $isStored ?
+                    ZipFile::METHOD_STORED :
+                    ZipFile::METHOD_DEFLATED
+            );
+        }
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $result = static::assertVerifyZipAlign($this->outputFilename, true);
+        static::assertNotNull($result);
+
+        // check zip align
+        static::assertTrue($result);
+    }
+}

tests/PhpZip/ZipEventTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipException;
+
+/**
+ * @internal
+ *
+ * @small
+ */
+class ZipEventTest extends ZipTestCase
+{
+    /**
+     * @throws ZipException
+     */
+    public function testBeforeSave()
+    {
+        $zipFile = new Internal\ZipFileExtended();
+        $zipFile->openFile(__DIR__ . '/resources/apk.zip');
+        static::assertTrue(isset($zipFile['META-INF/MANIFEST.MF']));
+        static::assertTrue(isset($zipFile['META-INF/CERT.SF']));
+        static::assertTrue(isset($zipFile['META-INF/CERT.RSA']));
+        $zipFile->saveAsFile($this->outputFilename);
+        static::assertFalse(isset($zipFile['META-INF/MANIFEST.MF']));
+        static::assertFalse(isset($zipFile['META-INF/CERT.SF']));
+        static::assertFalse(isset($zipFile['META-INF/CERT.RSA']));
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+        $result = static::assertVerifyZipAlign($this->outputFilename);
+
+        if ($result !== null) {
+            static::assertTrue($result);
+        }
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFalse(isset($zipFile['META-INF/MANIFEST.MF']));
+        static::assertFalse(isset($zipFile['META-INF/CERT.SF']));
+        static::assertFalse(isset($zipFile['META-INF/CERT.RSA']));
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipFileAddDirTest.php

@@ -0,0 +1,476 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipException;
+use PhpZip\Util\Iterator\IgnoreFilesFilterIterator;
+use PhpZip\Util\Iterator\IgnoreFilesRecursiveFilterIterator;
+
+/**
+ * Test add directory to zip archive.
+ *
+ * @internal
+ *
+ * @small
+ */
+class ZipFileAddDirTest extends ZipTestCase
+{
+    protected static $files = [
+        '.hidden' => 'Hidden file',
+        'text file.txt' => 'Text file',
+        'Текстовый документ.txt' => 'Текстовый документ',
+        'empty dir/' => null,
+        'empty dir2/ещё пустой каталог/' => null,
+        'catalog/New File' => 'New Catalog File',
+        'catalog/New File 2' => 'New Catalog File 2',
+        'catalog/Empty Dir/' => null,
+        'category/list.txt' => 'Category list',
+        'category/Pictures/128x160/Car/01.jpg' => 'File 01.jpg',
+        'category/Pictures/128x160/Car/02.jpg' => 'File 02.jpg',
+        'category/Pictures/240x320/Car/01.jpg' => 'File 01.jpg',
+        'category/Pictures/240x320/Car/02.jpg' => 'File 02.jpg',
+    ];
+
+    /**
+     * Before test.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->fillDirectory();
+    }
+
+    protected function fillDirectory()
+    {
+        foreach (self::$files as $name => $content) {
+            $fullName = $this->outputDirname . '/' . $name;
+
+            if ($content === null) {
+                if (!is_dir($fullName)) {
+                    mkdir($fullName, 0755, true);
+                }
+            } else {
+                $dirname = \dirname($fullName);
+
+                if (!is_dir($dirname)) {
+                    mkdir($dirname, 0755, true);
+                }
+                file_put_contents($fullName, $content);
+            }
+        }
+    }
+
+    /**
+     * @param ZipFile $zipFile
+     * @param array   $actualResultFiles
+     * @param string  $localPath
+     */
+    protected static function assertFilesResult(
+        ZipFile $zipFile,
+        array $actualResultFiles = [],
+        $localPath = '/'
+    ) {
+        $localPath = rtrim($localPath, '/');
+        $localPath = empty($localPath) ? '' : $localPath . '/';
+        static::assertCount(\count($zipFile), $actualResultFiles);
+        $actualResultFiles = array_flip($actualResultFiles);
+
+        foreach (self::$files as $file => $content) {
+            $zipEntryName = $localPath . $file;
+
+            if (isset($actualResultFiles[$file])) {
+                static::assertTrue(isset($zipFile[$zipEntryName]));
+                static::assertSame($zipFile[$zipEntryName], $content);
+                unset($actualResultFiles[$file]);
+            } else {
+                static::assertFalse(isset($zipFile[$zipEntryName]));
+            }
+        }
+        static::assertEmpty($actualResultFiles);
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddDirWithLocalPath()
+    {
+        $localPath = 'to/path';
+
+        $zipFile = new ZipFile();
+        $zipFile->addDir($this->outputDirname, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                '.hidden',
+                'text file.txt',
+                'Текстовый документ.txt',
+                'empty dir/',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddDirWithoutLocalPath()
+    {
+        $zipFile = new ZipFile();
+        $zipFile->addDir($this->outputDirname);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                '.hidden',
+                'text file.txt',
+                'Текстовый документ.txt',
+                'empty dir/',
+            ]
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddFilesFromIterator()
+    {
+        $localPath = 'to/project';
+
+        $directoryIterator = new \DirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($directoryIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                '.hidden',
+                'text file.txt',
+                'Текстовый документ.txt',
+                'empty dir/',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddFilesFromIteratorEmptyLocalPath()
+    {
+        $localPath = '';
+
+        $directoryIterator = new \DirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($directoryIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                '.hidden',
+                'text file.txt',
+                'Текстовый документ.txt',
+                'empty dir/',
+            ]
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddFilesFromRecursiveIterator()
+    {
+        $localPath = 'to/project';
+
+        $directoryIterator = new \RecursiveDirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($directoryIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult($zipFile, array_keys(self::$files), $localPath);
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddRecursiveDirWithLocalPath()
+    {
+        $localPath = 'to/path';
+
+        $zipFile = new ZipFile();
+        $zipFile->addDirRecursive($this->outputDirname, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult($zipFile, array_keys(self::$files), $localPath);
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddRecursiveDirWithoutLocalPath()
+    {
+        $zipFile = new ZipFile();
+        $zipFile->addDirRecursive($this->outputDirname);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult($zipFile, array_keys(self::$files));
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddFilesFromIteratorWithIgnoreFiles()
+    {
+        $localPath = 'to/project';
+        $ignoreFiles = [
+            'Текстовый документ.txt',
+            'empty dir/',
+        ];
+
+        $directoryIterator = new \DirectoryIterator($this->outputDirname);
+        $ignoreIterator = new IgnoreFilesFilterIterator($directoryIterator, $ignoreFiles);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($ignoreIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                '.hidden',
+                'text file.txt',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testAddFilesFromRecursiveIteratorWithIgnoreFiles()
+    {
+        $localPath = 'to/project';
+        $ignoreFiles = [
+            '.hidden',
+            'empty dir2/ещё пустой каталог/',
+            'list.txt',
+            'category/Pictures/240x320',
+        ];
+
+        $directoryIterator = new \RecursiveDirectoryIterator($this->outputDirname);
+        $ignoreIterator = new IgnoreFilesRecursiveFilterIterator($directoryIterator, $ignoreFiles);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($ignoreIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                'text file.txt',
+                'Текстовый документ.txt',
+                'empty dir/',
+                'catalog/New File',
+                'catalog/New File 2',
+                'catalog/Empty Dir/',
+                'category/Pictures/128x160/Car/01.jpg',
+                'category/Pictures/128x160/Car/02.jpg',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * Create archive and add files from glob pattern.
+     *
+     * @throws ZipException
+     */
+    public function testAddFilesFromGlob()
+    {
+        $localPath = '/';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromGlob($this->outputDirname, '**.{txt,jpg}', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                'text file.txt',
+                'Текстовый документ.txt',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * Create archive and add recursively files from glob pattern.
+     *
+     * @throws ZipException
+     */
+    public function testAddFilesFromGlobRecursive()
+    {
+        $localPath = '/';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromGlobRecursive($this->outputDirname, '**.{txt,jpg}', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                'text file.txt',
+                'Текстовый документ.txt',
+                'category/list.txt',
+                'category/Pictures/128x160/Car/01.jpg',
+                'category/Pictures/128x160/Car/02.jpg',
+                'category/Pictures/240x320/Car/01.jpg',
+                'category/Pictures/240x320/Car/02.jpg',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * Create archive and add files from regex pattern.
+     *
+     * @throws ZipException
+     */
+    public function testAddFilesFromRegex()
+    {
+        $localPath = 'path';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromRegex($this->outputDirname, '~\.(txt|jpe?g)$~i', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                'text file.txt',
+                'Текстовый документ.txt',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * Create archive and add files recursively from regex pattern.
+     *
+     * @throws ZipException
+     */
+    public function testAddFilesFromRegexRecursive()
+    {
+        $localPath = '/';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromRegexRecursive($this->outputDirname, '~\.(txt|jpe?g)$~i', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult(
+            $zipFile,
+            [
+                'text file.txt',
+                'Текстовый документ.txt',
+                'category/list.txt',
+                'category/Pictures/128x160/Car/01.jpg',
+                'category/Pictures/128x160/Car/02.jpg',
+                'category/Pictures/240x320/Car/01.jpg',
+                'category/Pictures/240x320/Car/02.jpg',
+            ],
+            $localPath
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testArrayAccessAddDir()
+    {
+        $localPath = 'path/to';
+        $iterator = new \RecursiveDirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile[$localPath] = $iterator;
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertFilesResult($zipFile, array_keys(self::$files), $localPath);
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipMatcherTest.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace PhpZip;
+
+use PHPUnit\Framework\TestCase;
+use PhpZip\Model\ZipEntryMatcher;
+use PhpZip\Model\ZipInfo;
+
+/**
+ * @internal
+ *
+ * @small
+ */
+class ZipMatcherTest extends TestCase
+{
+    public function testMatcher()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile[$i] = $i;
+        }
+
+        $matcher = $zipFile->matcher();
+        static::assertInstanceOf(ZipEntryMatcher::class, $matcher);
+
+        static::assertInternalType('array', $matcher->getMatches());
+        static::assertCount(0, $matcher);
+
+        $matcher->add(1)->add(10)->add(20);
+        static::assertCount(3, $matcher);
+        static::assertEquals($matcher->getMatches(), ['1', '10', '20']);
+
+        $matcher->delete();
+        static::assertCount(97, $zipFile);
+        static::assertCount(0, $matcher);
+
+        $matcher->match('~^[2][1-5]|[3][6-9]|40$~s');
+        static::assertCount(10, $matcher);
+        $actualMatches = [
+            '21',
+            '22',
+            '23',
+            '24',
+            '25',
+            '36',
+            '37',
+            '38',
+            '39',
+            '40',
+        ];
+        static::assertSame($matcher->getMatches(), $actualMatches);
+        $matcher->setPassword('qwerty');
+        $info = $zipFile->getAllInfo();
+        array_walk(
+            $info,
+            function (ZipInfo $zipInfo) use ($actualMatches) {
+                $this->assertSame($zipInfo->isEncrypted(), \in_array($zipInfo->getName(), $actualMatches, true));
+            }
+        );
+
+        $matcher->all();
+        static::assertCount(\count($zipFile), $matcher);
+
+        $expectedNames = [];
+        $matcher->invoke(
+            static function ($entryName) use (&$expectedNames) {
+                $expectedNames[] = $entryName;
+            }
+        );
+        static::assertSame($expectedNames, $matcher->getMatches());
+
+        $zipFile->close();
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testDocsExample()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile['file_' . $i . '.jpg'] = random_bytes(100);
+        }
+
+        $renameEntriesArray = [
+            'file_10.jpg',
+            'file_11.jpg',
+            'file_12.jpg',
+            'file_13.jpg',
+            'file_14.jpg',
+            'file_15.jpg',
+            'file_16.jpg',
+            'file_17.jpg',
+            'file_18.jpg',
+            'file_19.jpg',
+            'file_50.jpg',
+            'file_51.jpg',
+            'file_52.jpg',
+            'file_53.jpg',
+            'file_54.jpg',
+            'file_55.jpg',
+            'file_56.jpg',
+            'file_57.jpg',
+            'file_58.jpg',
+            'file_59.jpg',
+        ];
+
+        foreach ($renameEntriesArray as $name) {
+            static::assertTrue(isset($zipFile[$name]));
+        }
+
+        $matcher = $zipFile->matcher();
+        $matcher->match('~^file_(1|5)\d+~');
+        static::assertSame($matcher->getMatches(), $renameEntriesArray);
+
+        $matcher->invoke(
+            static function ($entryName) use ($zipFile) {
+                $newName = preg_replace('~\.(jpe?g)$~i', '.no_optimize.$1', $entryName);
+                $zipFile->rename($entryName, $newName);
+            }
+        );
+
+        foreach ($renameEntriesArray as $name) {
+            static::assertFalse(isset($zipFile[$name]));
+
+            $pathInfo = pathinfo($name);
+            $newName = $pathInfo['filename'] . '.no_optimize.' . $pathInfo['extension'];
+            static::assertTrue(isset($zipFile[$newName]));
+        }
+
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipPasswordTest.php

@@ -0,0 +1,474 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\RuntimeException;
+use PhpZip\Exception\ZipAuthenticationException;
+use PhpZip\Exception\ZipEntryNotFoundException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Model\ZipInfo;
+
+/**
+ * Tests with zip password.
+ *
+ * @internal
+ *
+ * @small
+ */
+class ZipPasswordTest extends ZipFileAddDirTest
+{
+    /**
+     * Test archive password.
+     *
+     * @throws ZipException
+     * @throws \Exception
+     * @noinspection PhpRedundantCatchClauseInspection
+     */
+    public function testSetPassword()
+    {
+        if (\PHP_INT_SIZE === 4) { // php 32 bit
+            $this->setExpectedException(
+                RuntimeException::class,
+                'Traditional PKWARE Encryption is not supported in 32-bit PHP.'
+            );
+        }
+
+        $password = base64_encode(random_bytes(100));
+        $badPassword = 'bad password';
+
+        // create encryption password with ZipCrypto
+        $zipFile = new ZipFile();
+        $zipFile->addDir(__DIR__);
+        $zipFile->setPassword($password, ZipFile::ENCRYPTION_METHOD_TRADITIONAL);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename, $password);
+
+        // check bad password for ZipCrypto
+        $zipFile->openFile($this->outputFilename);
+        $zipFile->setReadPassword($badPassword);
+
+        foreach ($zipFile->getListFiles() as $entryName) {
+            try {
+                $zipFile[$entryName];
+                static::fail('Expected Exception has not been raised.');
+            } catch (ZipAuthenticationException $ae) {
+                static::assertContains('Invalid password for zip entry', $ae->getMessage());
+            }
+        }
+
+        // check correct password for ZipCrypto
+        $zipFile->setReadPassword($password);
+
+        foreach ($zipFile->getAllInfo() as $info) {
+            static::assertTrue($info->isEncrypted());
+            static::assertContains('ZipCrypto', $info->getMethodName());
+            $decryptContent = $zipFile[$info->getName()];
+            static::assertNotEmpty($decryptContent);
+            static::assertContains('<?php', $decryptContent);
+        }
+
+        // change encryption method to WinZip Aes and update file
+        $zipFile->setPassword($password, ZipFile::ENCRYPTION_METHOD_WINZIP_AES);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename, $password);
+
+        // check from WinZip AES encryption
+        $zipFile->openFile($this->outputFilename);
+        // set bad password WinZip AES
+        $zipFile->setReadPassword($badPassword);
+
+        foreach ($zipFile->getListFiles() as $entryName) {
+            try {
+                $zipFile[$entryName];
+                static::fail('Expected Exception has not been raised.');
+            } catch (ZipAuthenticationException $ae) {
+                static::assertNotNull($ae);
+            }
+        }
+
+        // set correct password WinZip AES
+        $zipFile->setReadPassword($password);
+
+        foreach ($zipFile->getAllInfo() as $info) {
+            static::assertTrue($info->isEncrypted());
+            static::assertContains('WinZip', $info->getMethodName());
+            $decryptContent = $zipFile[$info->getName()];
+            static::assertNotEmpty($decryptContent);
+            static::assertContains('<?php', $decryptContent);
+        }
+
+        // clear password
+        $zipFile->addFromString('file1', '');
+        $zipFile->disableEncryption();
+        $zipFile->addFromString('file2', '');
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename);
+
+        // check remove password
+        $zipFile->openFile($this->outputFilename);
+
+        foreach ($zipFile->getAllInfo() as $info) {
+            static::assertFalse($info->isEncrypted());
+        }
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     * @throws \Exception
+     */
+    public function testTraditionalEncryption()
+    {
+        if (\PHP_INT_SIZE === 4) { // php 32 bit
+            $this->setExpectedException(
+                RuntimeException::class,
+                'Traditional PKWARE Encryption is not supported in 32-bit PHP.'
+            );
+        }
+
+        $password = base64_encode(random_bytes(50));
+
+        $zip = new ZipFile();
+        $zip->addDirRecursive($this->outputDirname);
+        $zip->setPassword($password, ZipFile::ENCRYPTION_METHOD_TRADITIONAL);
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        static::assertCorrectZipArchive($this->outputFilename, $password);
+
+        $zip->openFile($this->outputFilename);
+        $zip->setReadPassword($password);
+        static::assertFilesResult($zip, array_keys(self::$files));
+
+        foreach ($zip->getAllInfo() as $info) {
+            if (!$info->isFolder()) {
+                static::assertTrue($info->isEncrypted());
+                static::assertContains('ZipCrypto', $info->getMethodName());
+            }
+        }
+        $zip->close();
+    }
+
+    /**
+     * @dataProvider winZipKeyStrengthProvider
+     *
+     * @param int $encryptionMethod
+     * @param int $bitSize
+     *
+     * @throws ZipException
+     * @throws \Exception
+     */
+    public function testWinZipAesEncryption($encryptionMethod, $bitSize)
+    {
+        $password = base64_encode(random_bytes(50));
+
+        $zip = new ZipFile();
+        $zip->addDirRecursive($this->outputDirname);
+        $zip->setPassword($password, $encryptionMethod);
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        static::assertCorrectZipArchive($this->outputFilename, $password);
+
+        $zip->openFile($this->outputFilename);
+        $zip->setReadPassword($password);
+        static::assertFilesResult($zip, array_keys(self::$files));
+
+        foreach ($zip->getAllInfo() as $info) {
+            if (!$info->isFolder()) {
+                static::assertTrue($info->isEncrypted());
+                static::assertSame($info->getEncryptionMethod(), $encryptionMethod);
+                static::assertContains('WinZip AES-' . $bitSize, $info->getMethodName());
+            }
+        }
+        $zip->close();
+    }
+
+    /**
+     * @return array
+     */
+    public function winZipKeyStrengthProvider()
+    {
+        return [
+            [ZipFile::ENCRYPTION_METHOD_WINZIP_AES_128, 128],
+            [ZipFile::ENCRYPTION_METHOD_WINZIP_AES_192, 192],
+            [ZipFile::ENCRYPTION_METHOD_WINZIP_AES, 256],
+            [ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256, 256],
+        ];
+    }
+
+    /**
+     * @throws Exception\ZipEntryNotFoundException
+     * @throws ZipException
+     */
+    public function testEncryptionEntries()
+    {
+        if (\PHP_INT_SIZE === 4) { // php 32 bit
+            $this->setExpectedException(
+                RuntimeException::class,
+                'Traditional PKWARE Encryption is not supported in 32-bit PHP.'
+            );
+        }
+
+        $password1 = '353442434235424234';
+        $password2 = 'adgerhvrwjhqqehtqhkbqrgewg';
+
+        $zip = new ZipFile();
+        $zip->addDir($this->outputDirname);
+        $zip->setPasswordEntry('.hidden', $password1, ZipFile::ENCRYPTION_METHOD_TRADITIONAL);
+        $zip->setPasswordEntry('text file.txt', $password2, ZipFile::ENCRYPTION_METHOD_WINZIP_AES);
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        $zip->openFile($this->outputFilename);
+        $zip->setReadPasswordEntry('.hidden', $password1);
+        $zip->setReadPasswordEntry('text file.txt', $password2);
+        static::assertFilesResult(
+            $zip,
+            [
+                '.hidden',
+                'text file.txt',
+                'Текстовый документ.txt',
+                'empty dir/',
+            ]
+        );
+
+        $info = $zip->getEntryInfo('.hidden');
+        static::assertTrue($info->isEncrypted());
+        static::assertContains('ZipCrypto', $info->getMethodName());
+
+        $info = $zip->getEntryInfo('text file.txt');
+        static::assertTrue($info->isEncrypted());
+        static::assertContains('WinZip AES', $info->getMethodName());
+
+        static::assertFalse($zip->getEntryInfo('Текстовый документ.txt')->isEncrypted());
+        static::assertFalse($zip->getEntryInfo('empty dir/')->isEncrypted());
+
+        $zip->close();
+    }
+
+    /**
+     * @throws Exception\ZipEntryNotFoundException
+     * @throws ZipException
+     */
+    public function testEncryptionEntriesWithDefaultPassword()
+    {
+        if (\PHP_INT_SIZE === 4) { // php 32 bit
+            $this->setExpectedException(
+                RuntimeException::class,
+                'Traditional PKWARE Encryption is not supported in 32-bit PHP.'
+            );
+        }
+
+        $password1 = '353442434235424234';
+        $password2 = 'adgerhvrwjhqqehtqhkbqrgewg';
+        $defaultPassword = '  f  f  f  f f  ffff   f5   ';
+
+        $zip = new ZipFile();
+        $zip->addDir($this->outputDirname);
+        $zip->setPassword($defaultPassword);
+        $zip->setPasswordEntry('.hidden', $password1, ZipFile::ENCRYPTION_METHOD_TRADITIONAL);
+        $zip->setPasswordEntry('text file.txt', $password2, ZipFile::ENCRYPTION_METHOD_WINZIP_AES);
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        $zip->openFile($this->outputFilename);
+        $zip->setReadPassword($defaultPassword);
+        $zip->setReadPasswordEntry('.hidden', $password1);
+        $zip->setReadPasswordEntry('text file.txt', $password2);
+        static::assertFilesResult(
+            $zip,
+            [
+                '.hidden',
+                'text file.txt',
+                'Текстовый документ.txt',
+                'empty dir/',
+            ]
+        );
+
+        $info = $zip->getEntryInfo('.hidden');
+        static::assertTrue($info->isEncrypted());
+        static::assertContains('ZipCrypto', $info->getMethodName());
+
+        $info = $zip->getEntryInfo('text file.txt');
+        static::assertTrue($info->isEncrypted());
+        static::assertContains('WinZip AES', $info->getMethodName());
+
+        $info = $zip->getEntryInfo('Текстовый документ.txt');
+        static::assertTrue($info->isEncrypted());
+        static::assertContains('WinZip AES', $info->getMethodName());
+
+        static::assertFalse($zip->getEntryInfo('empty dir/')->isEncrypted());
+
+        $zip->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testSetEncryptionMethodInvalid()
+    {
+        $this->setExpectedException(ZipException::class, 'Invalid encryption method');
+
+        $zipFile = new ZipFile();
+        $encryptionMethod = 9999;
+        $zipFile->setPassword('pass', $encryptionMethod);
+        $zipFile['entry'] = 'content';
+        $zipFile->outputAsString();
+    }
+
+    /**
+     * @throws Exception\ZipEntryNotFoundException
+     * @throws ZipException
+     */
+    public function testEntryPassword()
+    {
+        $zipFile = new ZipFile();
+        $zipFile->setPassword('pass');
+        $zipFile['file'] = 'content';
+        static::assertFalse($zipFile->getEntryInfo('file')->isEncrypted());
+        for ($i = 1; $i <= 10; $i++) {
+            $zipFile['file' . $i] = 'content';
+
+            if ($i < 6) {
+                $zipFile->setPasswordEntry('file' . $i, 'pass');
+                static::assertTrue($zipFile->getEntryInfo('file' . $i)->isEncrypted());
+            } else {
+                static::assertFalse($zipFile->getEntryInfo('file' . $i)->isEncrypted());
+            }
+        }
+        $zipFile->disableEncryptionEntry('file3');
+        static::assertFalse($zipFile->getEntryInfo('file3')->isEncrypted());
+        static::assertTrue($zipFile->getEntryInfo('file2')->isEncrypted());
+        $zipFile->disableEncryption();
+        $infoList = $zipFile->getAllInfo();
+        array_walk(
+            $infoList,
+            function (ZipInfo $zipInfo) {
+                $this->assertFalse($zipInfo->isEncrypted());
+            }
+        );
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipException
+     */
+    public function testInvalidEncryptionMethodEntry()
+    {
+        $this->setExpectedException(ZipException::class, 'Invalid encryption method');
+
+        $zipFile = new ZipFile();
+        $zipFile->addFromString('file', 'content', ZipFile::METHOD_STORED);
+        $zipFile->setPasswordEntry('file', 'pass', 99);
+    }
+
+    /**
+     * @throws ZipEntryNotFoundException
+     * @throws ZipException
+     */
+    public function testArchivePasswordUpdateWithoutSetReadPassword()
+    {
+        $zipFile = new ZipFile();
+        $zipFile['file1'] = 'content';
+        $zipFile['file2'] = 'content';
+        $zipFile['file3'] = 'content';
+        $zipFile->setPassword('password');
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        static::assertCorrectZipArchive($this->outputFilename, 'password');
+
+        $zipFile->openFile($this->outputFilename);
+        static::assertCount(3, $zipFile);
+
+        foreach ($zipFile->getAllInfo() as $info) {
+            static::assertTrue($info->isEncrypted());
+        }
+        unset($zipFile['file3']);
+        $zipFile['file4'] = 'content';
+        $zipFile->rewrite();
+
+        static::assertCorrectZipArchive($this->outputFilename, 'password');
+
+        static::assertCount(3, $zipFile);
+        static::assertFalse(isset($zipFile['file3']));
+        static::assertTrue(isset($zipFile['file4']));
+        static::assertTrue($zipFile->getEntryInfo('file1')->isEncrypted());
+        static::assertTrue($zipFile->getEntryInfo('file2')->isEncrypted());
+        static::assertFalse($zipFile->getEntryInfo('file4')->isEncrypted());
+        static::assertSame($zipFile['file4'], 'content');
+
+        $zipFile->extractTo($this->outputDirname, ['file4']);
+
+        static::assertFileExists($this->outputDirname . \DIRECTORY_SEPARATOR . 'file4');
+        static::assertStringEqualsFile($this->outputDirname . \DIRECTORY_SEPARATOR . 'file4', $zipFile['file4']);
+
+        $zipFile->close();
+    }
+
+    /**
+     * @see https://github.com/Ne-Lexa/php-zip/issues/9
+     *
+     * @throws ZipException
+     * @throws \Exception
+     */
+    public function testIssues9()
+    {
+        $contents = str_pad('', 1000, 'test;test2;test3' . \PHP_EOL, \STR_PAD_RIGHT);
+        $password = base64_encode(random_bytes(20));
+
+        $encryptMethod = ZipFile::ENCRYPTION_METHOD_WINZIP_AES_256;
+        $zipFile = new ZipFile();
+        $zipFile
+            ->addFromString('codes.csv', $contents)
+            ->setPassword($password, $encryptMethod)
+            ->saveAsFile($this->outputFilename)
+            ->close()
+        ;
+
+        static::assertCorrectZipArchive($this->outputFilename, $password);
+
+        $zipFile->openFile($this->outputFilename);
+        $zipFile->setReadPassword($password);
+        static::assertSame($zipFile['codes.csv'], $contents);
+        $zipFile->close();
+    }
+
+    /**
+     * @throws ZipEntryNotFoundException
+     * @throws ZipException
+     */
+    public function testReadAesEncryptedAndRewriteArchive()
+    {
+        $file = __DIR__ . '/resources/aes_password_archive.zip';
+        $password = '1234567890';
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($file);
+        $zipFile->setReadPassword($password);
+        $zipFile->setEntryComment('contents.txt', 'comment'); // change entry, but not changed contents
+        $zipFile->saveAsFile($this->outputFilename);
+
+        $zipFile2 = new ZipFile();
+        $zipFile2->openFile($this->outputFilename);
+        $zipFile2->setReadPassword($password);
+        static::assertSame($zipFile2->getListFiles(), $zipFile->getListFiles());
+
+        foreach ($zipFile as $name => $contents) {
+            static::assertNotEmpty($name);
+            static::assertNotEmpty($contents);
+            static::assertContains('test contents', $contents);
+            static::assertSame($zipFile2[$name], $contents);
+        }
+        $zipFile2->close();
+
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipRemoteFileTest.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipException;
+
+/**
+ * Test add remote files to zip archive.
+ *
+ * @internal
+ *
+ * @small
+ */
+class ZipRemoteFileTest extends ZipTestCase
+{
+    /**
+     * @throws ZipException
+     */
+    public function testAddRemoteFileFromStream()
+    {
+        $zipFile = new ZipFile();
+        $outputZip = $this->outputFilename;
+        $fileUrl = 'https://raw.githubusercontent.com/Ne-Lexa/php-zip/master/README.md';
+        /** @noinspection PhpUsageOfSilenceOperatorInspection */
+        $fp = @fopen(
+            $fileUrl,
+            'rb',
+            false,
+            stream_context_create(
+                [
+                    'http' => [
+                        'timeout' => 3,
+                    ],
+                ]
+            )
+        );
+
+        if ($fp === false) {
+            static::markTestSkipped(
+                sprintf(
+                    'Could not fetch remote file: %s',
+                    $fileUrl
+                )
+            );
+
+            return;
+        }
+
+        $fileName = 'remote-file-from-http-stream.md';
+        $zipFile->addFromStream($fp, $fileName);
+
+        $zipFile->saveAsFile($outputZip);
+        $zipFile->close();
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($outputZip);
+        $files = $zipFile->getListFiles();
+        static::assertCount(1, $files);
+        static::assertSame($fileName, $files[0]);
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipSlipVulnerabilityTest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace PhpZip;
+
+/**
+ * Class ZipSlipVulnerabilityTest.
+ *
+ * @see https://github.com/Ne-Lexa/php-zip/issues/39 Issue#31
+ * @see https://snyk.io/research/zip-slip-vulnerability Zip Slip Vulnerability
+ *
+ * @internal
+ *
+ * @small
+ */
+class ZipSlipVulnerabilityTest extends ZipTestCase
+{
+    /**
+     * @throws Exception\ZipException
+     */
+    public function testCreateSlipVulnerabilityFile()
+    {
+        $localFile = '../dir/./../../file.txt';
+        $zipFile = new ZipFile();
+        $zipFile->addFromString($localFile, 'contents');
+        static::assertContains($localFile, $zipFile->getListFiles());
+        $zipFile->close();
+    }
+
+    /**
+     * @throws Exception\ZipException
+     */
+    public function testUnpack()
+    {
+        static::assertTrue(mkdir($this->outputDirname, 0755, true));
+
+        $zipFile = new ZipFile();
+        $zipFile->addFromString('../dir/./../../file.txt', 'contents');
+        $zipFile->extractTo($this->outputDirname);
+        $zipFile->close();
+
+        $expectedExtractedFile = $this->outputDirname . '/dir/file.txt';
+        static::assertTrue(is_file($expectedExtractedFile));
+    }
+}

tests/PhpZip/ZipTestCase.php

@@ -1,29 +1,123 @@
 <?php
+
 namespace PhpZip;
 
+use PHPUnit\Framework\TestCase;
+use PhpZip\Model\EndOfCentralDirectory;
+use PhpZip\Util\FilesUtil;
+
 /**
  * PHPUnit test case and helper methods.
  */
-class ZipTestCase extends \PHPUnit_Framework_TestCase
+abstract class ZipTestCase extends TestCase
 {
+    /** @var string */
+    protected $outputFilename;
+
+    /** @var string */
+    protected $outputDirname;
+
+    /**
+     * Before test.
+     *
+     * @noinspection PhpMissingParentCallCommonInspection
+     */
+    protected function setUp()
+    {
+        $id = uniqid('phpzip', true);
+        $tempDir = sys_get_temp_dir() . '/phpunit-phpzip';
+
+        if (!is_dir($tempDir) && !mkdir($tempDir, 0755, true) && !is_dir($tempDir)) {
+            throw new \RuntimeException('Dir ' . $tempDir . " can't created");
+        }
+        $this->outputFilename = $tempDir . '/' . $id . '.zip';
+        $this->outputDirname = $tempDir . '/' . $id;
+    }
+
+    /**
+     * After test.
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
+
+        if ($this->outputFilename !== null && file_exists($this->outputFilename)) {
+            unlink($this->outputFilename);
+        }
+
+        if ($this->outputDirname !== null && is_dir($this->outputDirname)) {
+            FilesUtil::removeDir($this->outputDirname);
+        }
+    }
+
     /**
      * Assert correct zip archive.
      *
-     * @param $filename
+     * @param string      $filename
+     * @param string|null $password
      */
-    public static function assertCorrectZipArchive($filename)
+    public static function assertCorrectZipArchive($filename, $password = null)
     {
-        if (DIRECTORY_SEPARATOR !== '\\' && `which zip`) {
-            exec("zip -T " . escapeshellarg($filename), $output, $returnCode);
+        if (self::existsProgram('unzip')) {
+            $command = 'unzip';
 
-            $output = implode(PHP_EOL, $output);
+            if ($password !== null) {
+                $command .= ' -P ' . escapeshellarg($password);
+            }
+            $command .= ' -t ' . escapeshellarg($filename);
+            $command .= ' 2>&1';
+            exec($command, $output, $returnCode);
 
-            self::assertEquals($returnCode, 0);
-            self::assertNotContains('zip error', $output);
-            self::assertContains(' OK', $output);
+            $output = implode(\PHP_EOL, $output);
+
+            if ($password !== null && $returnCode === 81) {
+                if (self::existsProgram('7z')) {
+                    /**
+                     * WinZip 99-character limit.
+                     *
+                     * @see https://sourceforge.net/p/p7zip/discussion/383044/thread/c859a2f0/
+                     */
+                    $password = substr($password, 0, 99);
+
+                    $command = '7z t -p' . escapeshellarg($password) . ' ' . escapeshellarg($filename);
+                    exec($command, $output, $returnCode);
+                    /**
+                     * @var array $output
+                     */
+                    $output = implode(\PHP_EOL, $output);
+
+                    static::assertSame($returnCode, 0);
+                    static::assertNotContains(' Errors', $output);
+                    static::assertContains(' Ok', $output);
+                } else {
+                    fwrite(\STDERR, 'Program unzip cannot support this function.' . \PHP_EOL);
+                    fwrite(\STDERR, 'Please install 7z. For Ubuntu-like: sudo apt-get install p7zip-full' . \PHP_EOL);
+                }
+            } else {
+                static::assertSame($returnCode, 0, $output);
+                static::assertNotContains('incorrect password', $output);
+                static::assertContains(' OK', $output);
+                static::assertContains('No errors', $output);
+            }
         }
     }
 
+    /**
+     * @param string $program
+     *
+     * @return bool
+     */
+    private static function existsProgram($program)
+    {
+        if (\DIRECTORY_SEPARATOR !== '\\') {
+            exec('which ' . escapeshellarg($program), $output, $returnCode);
+
+            return $returnCode === 0;
+        }
+        // false for Windows
+        return false;
+    }
+
     /**
      * Assert correct empty zip archive.
      *
@@ -31,31 +125,37 @@ class ZipTestCase extends \PHPUnit_Framework_TestCase
      */
     public static function assertCorrectEmptyZip($filename)
     {
-        if (DIRECTORY_SEPARATOR !== '\\' && `which zipinfo`) {
-            exec("zipinfo " . escapeshellarg($filename), $output, $returnCode);
+        if (self::existsProgram('zipinfo')) {
+            exec('zipinfo ' . escapeshellarg($filename), $output, $returnCode);
 
-            $output = implode(PHP_EOL, $output);
+            $output = implode(\PHP_EOL, $output);
 
-            self::assertContains('Empty zipfile', $output);
+            static::assertContains('Empty zipfile', $output);
         }
-        $actualEmptyZipData = pack('VVVVVv', ZipConstants::END_OF_CENTRAL_DIRECTORY_RECORD_SIG, 0, 0, 0, 0, 0);
-        self::assertEquals(file_get_contents($filename), $actualEmptyZipData);
+        $actualEmptyZipData = pack('VVVVVv', EndOfCentralDirectory::END_OF_CD_SIG, 0, 0, 0, 0, 0);
+        static::assertStringEqualsFile($filename, $actualEmptyZipData);
     }
 
     /**
      * @param string $filename
-     * @return bool|null If null - can not install zipalign
+     * @param bool   $showErrors
+     *
+     * @return bool|null If null returned, then the zipalign program is not installed
      */
-    public static function doZipAlignVerify($filename)
+    public static function assertVerifyZipAlign($filename, $showErrors = false)
     {
-        if (DIRECTORY_SEPARATOR !== '\\' && `which zipalign`) {
-            exec("zipalign -c -v 4 " . escapeshellarg($filename), $output, $returnCode);
-            return $returnCode === 0;
-        } else {
-            echo 'Can not find program "zipalign" for test' . PHP_EOL;
-            fwrite(STDERR, 'Can not find program "zipalign" for test');
-            return null;
-        }
-    }
+        if (self::existsProgram('zipalign')) {
+            exec('zipalign -c -v 4 ' . escapeshellarg($filename), $output, $returnCode);
 
-}
+            if ($showErrors && $returnCode !== 0) {
+                fwrite(\STDERR, implode(\PHP_EOL, $output));
+            }
+
+            return $returnCode === 0;
+        }
+
+        fwrite(\STDERR, "Cannot find the program 'zipalign' for the test" . \PHP_EOL);
+
+        return null;
+    }
+}