Merge branch 'hotfix/3.1.2'

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.

.gitignore

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

.travis.yml

@@ -0,0 +1,24 @@
+language: php
+php:
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - '7.1'
+  - nightly
+
+# cache vendor dirs
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+install:
+  - travis_retry composer self-update && composer --version
+  - travis_retry composer install --prefer-dist --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,821 @@
+`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();
+$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'); // вывести в браузер без сохранения в файл
+```
+Другие примеры можно посмотреть в папке `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,12 +1,15 @@
 {
   "name": "nelexa/zip",
-  "description": "Zip files CRUD. Open, create, update, extract and get info tool. Support read and write encrypted archives. Support ZIP64 ext. Alternative ZipArchive. It does not require php-zip extension.",
+  "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.",
   "type": "library",
   "keywords": [
     "zip",
+    "unzip",
     "archive",
     "extract",
-    "winzip"
+    "winzip",
+    "zipalign",
+    "ziparchive"
   ],
   "require-dev": {
     "phpunit/phpunit": "4.8"
@@ -21,17 +24,22 @@
   ],
   "minimum-stability": "stable",
   "require": {
-    "php-64bit": "^5.4 || ^7.0",
-    "ext-mbstring": "*"
+    "php": "^5.5 || ^7.0",
+    "psr/http-message": "^1.0"
   },
   "autoload": {
     "psr-4": {
-      "": "src/"
+      "PhpZip\\": "src/PhpZip"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "": "tests/"
+      "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"
   }
 }

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,9 +1,12 @@
 <?php
+
 namespace PhpZip\Crypto;
 
 use PhpZip\Exception\ZipAuthenticationException;
+use PhpZip\Exception\ZipCryptoException;
 use PhpZip\Model\ZipEntry;
 use PhpZip\Util\CryptoUtil;
+use PhpZip\Util\PackUtil;
 
 /**
  * Traditional PKWARE Encryption Engine.
@@ -12,7 +15,7 @@ use PhpZip\Util\CryptoUtil;
  * @author Ne-Lexa alexey@nelexa.ru
  * @license MIT
  */
-class TraditionalPkwareEncryptionEngine
+class TraditionalPkwareEncryptionEngine implements ZipEncryptionEngine
 {
     /**
      * Encryption header size
@@ -65,7 +68,6 @@ class TraditionalPkwareEncryptionEngine
      * @var array
      */
     private $keys = [];
-
     /**
      * @var ZipEntry
      */
@@ -79,7 +81,6 @@ class TraditionalPkwareEncryptionEngine
     public function __construct(ZipEntry $entry)
     {
         $this->entry = $entry;
-        $this->initKeys($entry->getPassword());
     }
 
     /**
@@ -105,9 +106,9 @@ class TraditionalPkwareEncryptionEngine
     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[1] = $this->keys[1] + ($this->keys[0] & 0xff);
+        $this->keys[1] = PackUtil::toSignedInt32($this->keys[1] * 134775813 + 1);
+        $this->keys[2] = PackUtil::toSignedInt32(self::crc32($this->keys[2], ($this->keys[1] >> 24) & 0xff));
     }
 
     /**
@@ -129,7 +130,11 @@ class TraditionalPkwareEncryptionEngine
      */
     public function decrypt($content)
     {
+        $password = $this->entry->getPassword();
+        $this->initKeys($password);
+
         $headerBytes = array_values(unpack('C*', substr($content, 0, self::STD_DEC_HDR_SIZE)));
+        $byte = 0;
         foreach ($headerBytes as &$byte) {
             $byte = ($byte ^ $this->decryptByte()) & 0xff;
             $this->updateKeys($byte);
@@ -137,12 +142,12 @@ class TraditionalPkwareEncryptionEngine
 
         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) {
+        if ($byte !== $checkByte) {
             throw new ZipAuthenticationException("Bad password for entry " . $this->entry->getName());
         }
 
@@ -170,15 +175,19 @@ class TraditionalPkwareEncryptionEngine
      * Encryption data
      *
      * @param string $data
-     * @param int $crc
      * @return string
      */
-    public function encrypt($data, $crc)
+    public function encrypt($data)
     {
+        $crc = $this->entry->isDataDescriptorRequired() ?
+            ($this->entry->getDosTime() & 0x0000ffff) << 16 :
+            $this->entry->getCrc();
         $headerBytes = CryptoUtil::randomBytes(self::STD_DEC_HDR_SIZE);
 
         // 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);
 
@@ -189,11 +198,12 @@ class TraditionalPkwareEncryptionEngine
     /**
      * @param string $content
      * @return string
+     * @throws ZipCryptoException
      */
     private function encryptData($content)
     {
-        if ($content === null) {
-            throw new \RuntimeException();
+        if (null === $content) {
+            throw new ZipCryptoException('content is null');
         }
         $buff = '';
         foreach (unpack('C*', $content) as $val) {
@@ -206,10 +216,10 @@ class TraditionalPkwareEncryptionEngine
      * @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,19 +1,22 @@
 <?php
+
 namespace PhpZip\Crypto;
 
+use PhpZip\Exception\RuntimeException;
 use PhpZip\Exception\ZipAuthenticationException;
 use PhpZip\Exception\ZipCryptoException;
-use PhpZip\Extra\WinZipAesEntryExtraField;
+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
@@ -42,35 +45,38 @@ class WinZipAesEngine
     /**
      * Decrypt from stream resource.
      *
-     * @param resource $stream Input stream resource
+     * @param string $content Input stream buffer
      * @return string
      * @throws ZipAuthenticationException
      * @throws ZipCryptoException
      */
-    public function decrypt($stream)
+    public function decrypt($content)
     {
-        /**
-         * @var WinZipAesEntryExtraField $field
-         */
-        $field = $this->entry->getExtraField(WinZipAesEntryExtraField::getHeaderId());
-        if (null === $field) {
+        $extraFieldsCollection = $this->entry->getExtraFieldsCollection();
+
+        if (!isset($extraFieldsCollection[WinZipAesEntryExtraField::getHeaderId()])) {
             throw new ZipCryptoException($this->entry->getName() . " (missing extra field for WinZip AES entry)");
         }
 
-        $pos = ftell($stream);
+        /**
+         * @var WinZipAesEntryExtraField $field
+         */
+        $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;
@@ -80,38 +86,47 @@ class WinZipAesEngine
         }
 
         // 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!");
         }
 
-        do {
-            assert($this->entry->getPassword() !== null);
-            assert(self::AES_BLOCK_SIZE_BITS <= $keyStrengthBits);
+        $password = $this->entry->getPassword();
+        assert($password !== null);
+        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);
+        $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 (substr($mac, 0, 10) !== $authenticationCode) {
+            throw new ZipAuthenticationException($this->entry->getName() .
+                " (authenticated WinZip AES entry content has been tampered with)");
         }
 
         return self::aesCtrSegmentIntegerCounter(false, $content, $key, $iv);
@@ -133,7 +148,7 @@ class WinZipAesEngine
         for ($i = 0; $i < $numOfBlocks; ++$i) {
             for ($j = 0; $j < 16; ++$j) {
                 $n = ord($iv[$j]);
-                if (++$n === 0x100) {
+                if (0x100 === ++$n) {
                     // overflow, set this one to 0, increment next
                     $iv[$j] = chr(0);
                 } else {
@@ -157,6 +172,7 @@ class WinZipAesEngine
      * @param string $key Aes key
      * @param string $iv Aes IV
      * @return string Encrypted data
+     * @throws RuntimeException
      */
     private static function encryptCtr($data, $key, $iv)
     {
@@ -166,7 +182,7 @@ class WinZipAesEngine
         } elseif (extension_loaded("mcrypt")) {
             return mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, "ctr", $iv);
         } else {
-            throw new \RuntimeException('Extension openssl or mcrypt not loaded');
+            throw new RuntimeException('Extension openssl or mcrypt not loaded');
         }
     }
 
@@ -177,6 +193,7 @@ class WinZipAesEngine
      * @param string $key Aes key
      * @param string $iv Aes IV
      * @return string Raw data
+     * @throws RuntimeException
      */
     private static function decryptCtr($data, $key, $iv)
     {
@@ -186,7 +203,7 @@ class WinZipAesEngine
         } elseif (extension_loaded("mcrypt")) {
             return mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $data, "ctr", $iv);
         } else {
-            throw new \RuntimeException('Extension openssl or mcrypt not loaded');
+            throw new RuntimeException('Extension openssl or mcrypt not loaded');
         }
     }
 
@@ -202,8 +219,12 @@ class WinZipAesEngine
         $password = $this->entry->getPassword();
         assert($password !== null);
 
-        $keyStrengthBytes = 32;
-        $keyStrengthBits = $keyStrengthBytes * 8;
+        // WinZip 99-character limit
+        // @see https://sourceforge.net/p/p7zip/discussion/383044/thread/c859a2f0/
+        $password = substr($password, 0, 99);
+
+        $keyStrengthBits = WinZipAesEntryExtraField::getKeyStrangeFromEncryptionMethod($this->entry->getEncryptionMethod());
+        $keyStrengthBytes = $keyStrengthBits / 8;
 
         assert(self::AES_BLOCK_SIZE_BITS <= $keyStrengthBits);
 
@@ -228,4 +249,4 @@ class WinZipAesEngine
             substr($mac, 0, 10)
         );
     }
-}
+}

src/PhpZip/Crypto/ZipEncryptionEngine.php

@@ -0,0 +1,32 @@
+<?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
+     * @return string
+     * @throws ZipAuthenticationException
+     */
+    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
@@ -36,12 +37,8 @@ class Crc32Exception extends ZipException
      */
     public function __construct($name, $expected, $actual)
     {
-        parent::__construct($name
-            . " (expected CRC32 value 0x"
-            . dechex($expected)
-            . ", but is actually 0x"
-            . dechex($actual)
-            . ")");
+        parent::__construct($name . " (expected CRC32 value 0x" .
+            dechex($expected) . ", but is actually 0x" . dechex($actual) . ")");
         assert($expected != $actual);
         $this->expectedCrc = $expected;
         $this->actualCrc = $actual;
@@ -66,5 +63,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,13 @@
+<?php
+
+namespace PhpZip\Exception;
+
+/**
+ * Runtime exception.
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class RuntimeException extends ZipException
+{
+}

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/ZipException.php

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

src/PhpZip/Exception/ZipNotFoundEntry.php

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

src/PhpZip/Exception/ZipUnsupportMethod.php

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

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,35 @@
 <?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.
-     *
-     * @return array|null
+     * Serializes a Data Block.
+     * @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.
-     *
-     * @return resource
-     * @throws ZipException If size data block out of range.
+     * Initializes this Extra Field by deserializing a Data Block.
+     * @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,240 @@
+<?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 sizeof($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.
+     * @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->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.
+     * @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->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.
+     * @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->collection[$headerId])) {
+            $ef = $this->collection[$headerId];
+            unset($this->collection[$headerId]);
+            return $ef;
+        }
+        throw new ZipException('ExtraField not found');
+    }
+
+    /**
+     * Whether a offset exists
+     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+     * @param mixed $offset <p>
+     * An offset to check for.
+     * </p>
+     * @return boolean 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
+     * @link http://php.net/manual/en/arrayaccess.offsetget.php
+     * @param mixed $offset <p>
+     * The offset to retrieve.
+     * </p>
+     * @return mixed Can return all value types.
+     * @since 5.0.0
+     */
+    public function offsetGet($offset)
+    {
+        return $this->get($offset);
+    }
+
+    /**
+     * Offset to set
+     * @link 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>
+     * @return void
+     * @throws InvalidArgumentException
+     * @since 5.0.0
+     */
+    public function offsetSet($offset, $value)
+    {
+        if ($value instanceof ExtraField) {
+            assert($offset == $value::getHeaderId());
+            $this->add($value);
+        } else {
+            throw new InvalidArgumentException('value is not instanceof ' . ExtraField::class);
+        }
+    }
+
+    /**
+     * Offset to unset
+     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+     * @param mixed $offset <p>
+     * The offset to unset.
+     * </p>
+     * @return void
+     * @since 5.0.0
+     */
+    public function offsetUnset($offset)
+    {
+        $this->remove($offset);
+    }
+
+    /**
+     * Return the current element
+     * @link 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
+     * @link http://php.net/manual/en/iterator.next.php
+     * @return void Any returned value is ignored.
+     * @since 5.0.0
+     */
+    public function next()
+    {
+        next($this->collection);
+    }
+
+    /**
+     * Return the key of the current element
+     * @link 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
+     * @link http://php.net/manual/en/iterator.valid.php
+     * @return boolean 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
+     * @link http://php.net/manual/en/iterator.rewind.php
+     * @return void Any returned value is ignored.
+     * @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,173 @@
+<?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
+     * @return ExtraFieldsCollection
+     * @throws ZipException
+     */
+    public static function createExtraFieldCollections($extra, ZipEntry $entry = null)
+    {
+        $extraFieldsCollection = new ExtraFieldsCollection();
+        if (null !== $extra) {
+            $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 = ExtraFieldsFactory::create($headerId);
+                if ($extraField instanceof Zip64ExtraField && $entry !== null) {
+                    $extraField->setEntry($entry);
+                }
+                $extraField->deserialize(substr($extra, $pos, $dataSize));
+                $pos += $dataSize;
+                $extraFieldsCollection[$headerId] = $extraField;
+            }
+        }
+        return $extraFieldsCollection;
+    }
+
+    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 (0x0000 > $size || $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.
+     * @return ExtraField A new Extra Field or null if not support header id.
+     * @throws ZipException If headerId is out of range.
+     */
+    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 ($extraField::getHeaderId() !== $headerId) {
+                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 (null === self::$registry) {
+            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,112 @@
+<?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
+     * @throws InvalidArgumentException
+     */
+    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,71 @@
+<?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 (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;
+    }
+
+    /**
+     * 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,51 @@
+<?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 (0 !== strlen($data)) {
+            throw new ZipException("JarMarker doesn't expect any data");
+        }
+    }
+}

src/PhpZip/Extra/Fields/NtfsExtraField.php

@@ -0,0 +1,133 @@
+<?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 (24 === $unpack['sizeAttr']) {
+            $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 (null !== $this->mtime && null !== $this->atime && null !== $this->ctime) {
+            $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,7 +1,10 @@
 <?php
-namespace PhpZip\Extra;
+
+namespace PhpZip\Extra\Fields;
 
 use PhpZip\Exception\ZipException;
+use PhpZip\Extra\ExtraField;
+use PhpZip\ZipFileInterface;
 
 /**
  * WinZip AES Extra Field.
@@ -11,7 +14,7 @@ use PhpZip\Exception\ZipException;
  * @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);
@@ -32,32 +35,38 @@ class WinZipAesEntryExtraField extends ExtraField
     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
     ];
 
+    protected static $encryptionMethods = [
+        self::KEY_STRENGTH_128BIT => ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_128,
+        self::KEY_STRENGTH_192BIT => ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_192,
+        self::KEY_STRENGTH_256BIT => ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_256
+    ];
+
     /**
      * Vendor version.
      *
      * @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 +80,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.
      *
@@ -155,6 +149,32 @@ class WinZipAesEntryExtraField extends ExtraField
         return $this->method & 0xffff;
     }
 
+    /**
+     * Internal encryption method.
+     *
+     * @return int
+     */
+    public function getEncryptionMethod()
+    {
+        return isset(self::$encryptionMethods[$this->getKeyStrength()]) ?
+            self::$encryptionMethods[$this->getKeyStrength()] :
+            self::$encryptionMethods[self::KEY_STRENGTH_256BIT];
+    }
+
+    /**
+     * @param int $encryptionMethod
+     * @return int
+     * @throws ZipException
+     */
+    public static function getKeyStrangeFromEncryptionMethod($encryptionMethod)
+    {
+        $flipKey = array_flip(self::$encryptionMethods);
+        if (!isset($flipKey[$encryptionMethod])) {
+            throw new ZipException("Unsupport encryption method " . $encryptionMethod);
+        }
+        return $flipKey[$encryptionMethod];
+    }
+
     /**
      * Sets compression method.
      *
@@ -169,37 +189,6 @@ class WinZipAesEntryExtraField extends ExtraField
         $this->method = $compressionMethod;
     }
 
-    /**
-     * 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 (self::DATA_SIZE != $size)
-            throw new ZipException();
-
-        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();
-        }
-        $this->setKeyStrength(self::keyStrength($keyStrength)); // checked
-        $this->setMethod($method);
-    }
-
     /**
      * Set key strength.
      *
@@ -218,19 +207,50 @@ class WinZipAesEntryExtraField extends ExtraField
      */
     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.
-     *
-     * @param resource $handle
-     * @param int $off Offset bytes
+     * Serializes a Data Block.
+     * @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 (self::DATA_SIZE !== $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 (self::VENDOR_ID !== $unpack['vendorId']) {
+            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,118 @@
+<?php
+
+namespace PhpZip\Extra\Fields;
+
+use PhpZip\Exception\RuntimeException;
+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 (null !== $entry) {
+            $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
+     * @throws RuntimeException
+     */
+    public function serialize()
+    {
+        if (null === $this->entry) {
+            throw new RuntimeException("entry is null");
+        }
+        $data = '';
+        // Write out Uncompressed Size.
+        $size = $this->entry->getSize();
+        if (0xffffffff <= $size) {
+            $data .= PackUtil::packLongLE($size);
+        }
+        // Write out Compressed Size.
+        $compressedSize = $this->entry->getCompressedSize();
+        if (0xffffffff <= $compressedSize) {
+            $data .= PackUtil::packLongLE($compressedSize);
+        }
+        // Write out Relative Header Offset.
+        $offset = $this->entry->getOffset();
+        if (0xffffffff <= $offset) {
+            $data .= PackUtil::packLongLE($offset);
+        }
+        return $data;
+    }
+
+    /**
+     * Initializes this Extra Field by deserializing a Data Block.
+     * @param string $data
+     * @throws RuntimeException
+     */
+    public function deserialize($data)
+    {
+        if (null === $this->entry) {
+            throw new RuntimeException("entry is null");
+        }
+        $off = 0;
+        // Read in Uncompressed Size.
+        $size = $this->entry->getSize();
+        if (0xffffffff <= $size) {
+            assert(0xffffffff === $size);
+            $this->entry->setSize(PackUtil::unpackLongLE(substr($data, $off, 8)));
+            $off += 8;
+        }
+        // Read in Compressed Size.
+        $compressedSize = $this->entry->getCompressedSize();
+        if (0xffffffff <= $compressedSize) {
+            assert(0xffffffff === $compressedSize);
+            $this->entry->setCompressedSize(PackUtil::unpackLongLE(substr($data, $off, 8)));
+            $off += 8;
+        }
+        // Read in Relative Header Offset.
+        $offset = $this->entry->getOffset();
+        if (0xffffffff <= $offset) {
+            assert(0xffffffff, $offset);
+            $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,4 +1,5 @@
 <?php
+
 namespace PhpZip\Mapper;
 
 /**
@@ -19,7 +20,7 @@ class OffsetPositionMapper extends PositionMapper
      */
     public function __construct($offset)
     {
-        $this->offset = $offset;
+        $this->offset = (int)$offset;
     }
 
     /**
@@ -39,4 +40,4 @@ class OffsetPositionMapper extends PositionMapper
     {
         return parent::unmap($position) - $this->offset;
     }
-}
+}

src/PhpZip/Mapper/PositionMapper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Mapper;
 
 /**
@@ -26,4 +27,4 @@ class PositionMapper
     {
         return $position;
     }
-}
+}

src/PhpZip/Model/EndOfCentralDirectory.php

@@ -1,49 +1,21 @@
 <?php
-namespace PhpZip;
+
+namespace PhpZip\Model;
 
 /**
- * Constants for ZIP files.
+ * Read 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;
-
     /** Zip64 End Of Central Directory Locator. */
     const ZIP64_END_OF_CENTRAL_DIRECTORY_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;
-
     /**
      * The minimum length of the End Of Central Directory Record.
      *
@@ -62,7 +34,6 @@ interface ZipConstants
      * zipfile comment length          2
      */
     const END_OF_CENTRAL_DIRECTORY_RECORD_MIN_LEN = 22;
-
     /**
      * The length of the Zip64 End Of Central Directory Locator.
      * zip64 end of central dir locator
@@ -75,7 +46,6 @@ interface ZipConstants
      * total number of disks           4
      */
     const ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_LEN = 20;
-
     /**
      * The minimum length of the Zip64 End Of Central Directory Record.
      *
@@ -98,18 +68,53 @@ interface ZipConstants
      * the starting disk number         8
      */
     const ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_MIN_LEN = 56;
+    /**
+     * @var string|null The archive comment.
+     */
+    private $comment;
+    /**
+     * @var int
+     */
+    private $entryCount;
+    /**
+     * @var bool
+     */
+    private $zip64 = false;
 
     /**
-     * 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
+     * EndOfCentralDirectory constructor.
+     * @param int $entryCount
+     * @param null|string $comment
+     * @param bool $zip64
      */
-    const LOCAL_FILE_HEADER_FILE_NAME_LENGTH_POS = 26;
+    public function __construct($entryCount, $comment, $zip64 = false)
+    {
+        $this->entryCount = $entryCount;
+        $this->comment = $comment;
+        $this->zip64 = $zip64;
+    }
 
-}
+    /**
+     * @return null|string
+     */
+    public function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEntryCount()
+    {
+        return $this->entryCount;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isZip64()
+    {
+        return $this->zip64;
+    }
+}

src/PhpZip/Model/Entry/OutputOffsetEntry.php

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

src/PhpZip/Model/Entry/ZipAbstractEntry.php

@@ -0,0 +1,765 @@
+<?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\ZipFileInterface;
+
+/**
+ * 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 int Bit flags for init state.
+     */
+    private $init;
+    /**
+     * @var string Entry name (filename in archive)
+     */
+    private $name;
+    /**
+     * @var int Made by platform
+     */
+    private $platform;
+    /**
+     * @var int
+     */
+    private $versionNeededToExtract = 20;
+    /**
+     * @var int Compression method
+     */
+    private $method;
+    /**
+     * @var int
+     */
+    private $general;
+    /**
+     * @var int Dos time
+     */
+    private $dosTime;
+    /**
+     * @var int Crc32
+     */
+    private $crc;
+    /**
+     * @var int Compressed size
+     */
+    private $compressedSize = self::UNKNOWN;
+    /**
+     * @var int Uncompressed size
+     */
+    private $size = self::UNKNOWN;
+    /**
+     * @var int External attributes
+     */
+    private $externalAttributes;
+    /**
+     * @var int Relative Offset Of Local File Header.
+     */
+    private $offset = self::UNKNOWN;
+    /**
+     * 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 Comment field.
+     */
+    private $comment;
+    /**
+     * @var string Entry password for read or write encryption data.
+     */
+    private $password;
+    /**
+     * Encryption method.
+     * @see ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL
+     * @see ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_128
+     * @see ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_192
+     * @see ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_256
+     * @var int
+     */
+    private $encryptionMethod = ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL;
+    /**
+     * @var int
+     */
+    private $compressionLevel = ZipFileInterface::LEVEL_DEFAULT_COMPRESSION;
+
+    /**
+     * ZipAbstractEntry constructor.
+     */
+    public function __construct()
+    {
+        $this->extraFieldsCollection = new ExtraFieldsCollection();
+    }
+
+    /**
+     * @param ZipEntry $entry
+     */
+    public function setEntry(ZipEntry $entry)
+    {
+        $this->setName($entry->getName());
+        $this->setPlatform($entry->getPlatform());
+        $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->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
+     * @return ZipEntry
+     * @throws ZipException
+     */
+    public function setName($name)
+    {
+        $length = strlen($name);
+        if (0x0000 > $length || $length > 0xffff) {
+            throw new ZipException('Illegal zip entry name parameter');
+        }
+        $this->setGeneralPurposeBitFlag(self::GPBF_UTF8, true);
+        $this->name = $name;
+        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->general |= $mask;
+        } else {
+            $this->general &= ~$mask;
+        }
+        return $this;
+    }
+
+    /**
+     * @return int Get platform
+     */
+    public function getPlatform()
+    {
+        return $this->isInit(self::BIT_PLATFORM) ? $this->platform & 0xffff : self::UNKNOWN;
+    }
+
+    /**
+     * Set platform
+     *
+     * @param int $platform
+     * @return ZipEntry
+     * @throws ZipException
+     */
+    public function setPlatform($platform)
+    {
+        $known = self::UNKNOWN !== $platform;
+        if ($known) {
+            if (0x00 > $platform || $platform > 0xff) {
+                throw new ZipException("Platform out of range");
+            }
+            $this->platform = $platform;
+        } else {
+            $this->platform = 0;
+        }
+        $this->setInit(self::BIT_PLATFORM, $known);
+        return $this;
+    }
+
+    /**
+     * @param int $mask
+     * @return bool
+     */
+    protected function isInit($mask)
+    {
+        return 0 !== ($this->init & $mask);
+    }
+
+    /**
+     * @param int $mask
+     * @param bool $init
+     */
+    protected function setInit($mask, $init)
+    {
+        if ($init) {
+            $this->init |= $mask;
+        } else {
+            $this->init &= ~$mask;
+        }
+    }
+
+    /**
+     * Version needed to extract.
+     *
+     * @return int
+     */
+    public function getVersionNeededToExtract()
+    {
+        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()
+    {
+        // Offset MUST be considered in decision about ZIP64 format - see
+        // description of Data Descriptor in ZIP File Format Specification!
+        return 0xffffffff <= $this->getCompressedSize()
+            || 0xffffffff <= $this->getSize()
+            || 0xffffffff <= sprintf('%u', $this->getOffset());
+    }
+
+    /**
+     * 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
+     * @throws ZipException
+     */
+    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
+     * @throws ZipException
+     */
+    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
+     * @throws ZipException
+     */
+    public function setOffset($offset)
+    {
+        $this->offset = $offset;
+        return $this;
+    }
+
+    /**
+     * Returns the General Purpose Bit Flags.
+     * @return int
+     */
+    public function getGeneralPurposeBitFlags()
+    {
+        return $this->general & 0xffff;
+    }
+
+    /**
+     * Sets the General Purpose Bit Flags.
+     *
+     * @var int general
+     * @return ZipEntry
+     * @throws ZipException
+     */
+    public function setGeneralPurposeBitFlags($general)
+    {
+        if (0x0000 > $general || $general > 0xffff) {
+            throw new ZipException('general out of range');
+        }
+        $this->general = $general;
+        if ($this->method === ZipFileInterface::METHOD_DEFLATED) {
+            $bit1 = $this->getGeneralPurposeBitFlag(self::GPBF_COMPRESSION_FLAG1);
+            $bit2 = $this->getGeneralPurposeBitFlag(self::GPBF_COMPRESSION_FLAG2);
+            if ($bit1 && !$bit2) {
+                $this->compressionLevel = ZipFileInterface::LEVEL_BEST_COMPRESSION;
+            } elseif (!$bit1 && $bit2) {
+                $this->compressionLevel = ZipFileInterface::LEVEL_FAST;
+            } elseif ($bit1 && $bit2) {
+                $this->compressionLevel = ZipFileInterface::LEVEL_SUPER_FAST;
+            } else {
+                $this->compressionLevel = ZipFileInterface::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 0 !== ($this->general & $mask);
+    }
+
+    /**
+     * Sets the encryption property to false and removes any other
+     * encryption artifacts.
+     *
+     * @return ZipEntry
+     */
+    public function disableEncryption()
+    {
+        $this->setEncrypted(false);
+        $headerId = WinZipAesEntryExtraField::getHeaderId();
+        if (isset($this->extraFieldsCollection[$headerId])) {
+            /**
+             * @var WinZipAesEntryExtraField $field
+             */
+            $field = $this->extraFieldsCollection[$headerId];
+            if (self::METHOD_WINZIP_AES === $this->getMethod()) {
+                $this->setMethod(null === $field ? 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->isInit(self::BIT_METHOD) ? $this->method & 0xffff : self::UNKNOWN;
+    }
+
+    /**
+     * Sets the compression method for this entry.
+     *
+     * @param int $method
+     * @return ZipEntry
+     * @throws ZipException If method is not STORED, DEFLATED, BZIP2 or UNKNOWN.
+     */
+    public function setMethod($method)
+    {
+        if (self::UNKNOWN === $method) {
+            $this->method = $method;
+            return $this;
+        }
+        if (0x0000 > $method || $method > 0xffff) {
+            throw new ZipException('method out of range');
+        }
+        switch ($method) {
+            case self::METHOD_WINZIP_AES:
+                $this->method = $method;
+                $this->setInit(self::BIT_METHOD, true);
+                break;
+
+            case ZipFileInterface::METHOD_STORED:
+            case ZipFileInterface::METHOD_DEFLATED:
+            case ZipFileInterface::METHOD_BZIP2:
+                $this->method = $method;
+                $this->setInit(self::BIT_METHOD, true);
+                break;
+
+            default:
+                throw new ZipException($this->name . " (unsupported compression method $method)");
+        }
+        return $this;
+    }
+
+    /**
+     * Get Unix Timestamp
+     *
+     * @return int
+     */
+    public function getTime()
+    {
+        if (!$this->isInit(self::BIT_DATE_TIME)) {
+            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
+     */
+    public function setDosTime($dosTime)
+    {
+        $dosTime = sprintf('%u', $dosTime);
+        if (0x00000000 > $dosTime || $dosTime > 0xffffffff) {
+            throw new ZipException('DosTime out of range');
+        }
+        $this->dosTime = $dosTime;
+        $this->setInit(self::BIT_DATE_TIME, true);
+    }
+
+    /**
+     * Set time from unix timestamp.
+     *
+     * @param int $unixTimestamp
+     * @return ZipEntry
+     */
+    public function setTime($unixTimestamp)
+    {
+        $known = self::UNKNOWN != $unixTimestamp;
+        if ($known) {
+            $this->dosTime = DateTimeConverter::toDosTime($unixTimestamp);
+        } else {
+            $this->dosTime = 0;
+        }
+        $this->setInit(self::BIT_DATE_TIME, $known);
+        return $this;
+    }
+
+    /**
+     * Returns the external file attributes.
+     *
+     * @return int The external file attributes.
+     */
+    public function getExternalAttributes()
+    {
+        if (!$this->isInit(self::BIT_EXTERNAL_ATTR)) {
+            return $this->isDirectory() ? 0x10 : 0;
+        }
+        return $this->externalAttributes;
+    }
+
+    /**
+     * Sets the external file attributes.
+     *
+     * @param int $externalAttributes the external file attributes.
+     * @return ZipEntry
+     * @throws ZipException
+     */
+    public function setExternalAttributes($externalAttributes)
+    {
+        $known = self::UNKNOWN != $externalAttributes;
+        if ($known) {
+            $this->externalAttributes = $externalAttributes;
+        } else {
+            $this->externalAttributes = 0;
+        }
+        $this->setInit(self::BIT_EXTERNAL_ATTR, $known);
+        return $this;
+    }
+
+    /**
+     * 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.
+     * @return string
+     * @throws ZipException
+     */
+    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
+     */
+    public function setExtra($data)
+    {
+        $this->extraFieldsCollection = ExtraFieldsFactory::createExtraFieldCollections($data, $this);
+    }
+
+    /**
+     * Returns comment entry
+     *
+     * @return string
+     */
+    public function getComment()
+    {
+        return null !== $this->comment ? $this->comment : "";
+    }
+
+    /**
+     * Set entry comment.
+     *
+     * @param $comment
+     * @return ZipEntry
+     * @throws ZipException
+     */
+    public function setComment($comment)
+    {
+        if (null !== $comment) {
+            $commentLength = strlen($comment);
+            if (0x0000 > $commentLength || $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 self::UNKNOWN == ($this->getCrc() | $this->getCompressedSize() | $this->getSize());
+    }
+
+    /**
+     * 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
+     * @throws ZipException
+     */
+    public function setCrc($crc)
+    {
+        $this->crc = $crc;
+        $this->setInit(self::BIT_CRC, true);
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    /**
+     * Set password and encryption method from entry
+     *
+     * @param string $password
+     * @param null|int $encryptionMethod
+     * @return ZipEntry
+     */
+    public function setPassword($password, $encryptionMethod = null)
+    {
+        $this->password = $password;
+        if (null !== $encryptionMethod) {
+            $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
+     *
+     * @see ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL
+     * @see ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_128
+     * @see ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_192
+     * @see ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_256
+     *
+     * @param int $encryptionMethod
+     * @return ZipEntry
+     * @throws ZipException
+     */
+    public function setEncryptionMethod($encryptionMethod)
+    {
+        if (null !== $encryptionMethod) {
+            if (
+                ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL !== $encryptionMethod
+                && ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_128 !== $encryptionMethod
+                && ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_192 !== $encryptionMethod
+                && ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_256 !== $encryptionMethod
+            ) {
+                throw new ZipException('Invalid encryption method');
+            }
+            $this->encryptionMethod = $encryptionMethod;
+        }
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompressionLevel()
+    {
+        return $this->compressionLevel;
+    }
+
+    /**
+     * @param int $compressionLevel
+     * @return ZipEntry
+     * @throws InvalidArgumentException
+     */
+    public function setCompressionLevel($compressionLevel = ZipFileInterface::LEVEL_DEFAULT_COMPRESSION)
+    {
+        if ($compressionLevel < ZipFileInterface::LEVEL_DEFAULT_COMPRESSION ||
+            $compressionLevel > ZipFileInterface::LEVEL_BEST_COMPRESSION
+        ) {
+            throw new InvalidArgumentException('Invalid compression level. Minimum level ' .
+                ZipFileInterface::LEVEL_DEFAULT_COMPRESSION . '. Maximum level ' . ZipFileInterface::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,63 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Exception\ZipException;
+
+/**
+ * Source Entry Changes
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipChangesEntry extends ZipAbstractEntry
+{
+    /**
+     * @var ZipSourceEntry
+     */
+    protected $entry;
+
+    /**
+     * ZipChangesEntry constructor.
+     * @param ZipSourceEntry $entry
+     */
+    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.
+     *
+     * @return null|string
+     * @throws ZipException
+     */
+    public function getEntryContent()
+    {
+        return $this->entry->getEntryContent();
+    }
+
+    /**
+     * @return ZipSourceEntry
+     */
+    public function getSourceEntry()
+    {
+        return $this->entry;
+    }
+}

src/PhpZip/Model/Entry/ZipNewEntry.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace PhpZip\Model\Entry;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\ZipException;
+use PhpZip\ZipFileInterface;
+
+/**
+ * Abstract class for new zip entry.
+ *
+ * @see https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT .ZIP File Format Specification
+ * @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
+     * @throws InvalidArgumentException
+     */
+    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 null|string
+     * @throws ZipException
+     */
+    public function getEntryContent()
+    {
+        if (is_resource($this->content)) {
+            return stream_get_contents($this->content, -1, 0);
+        }
+        return $this->content;
+    }
+
+    /**
+     * Version needed to extract.
+     *
+     * @return int
+     */
+    public function getVersionNeededToExtract()
+    {
+        $method = $this->getMethod();
+        return self::METHOD_WINZIP_AES === $method ? 51 :
+            (
+            ZipFileInterface::METHOD_BZIP2 === $method ? 46 :
+                (
+                $this->isZip64ExtensionsRequired() ? 45 :
+                    (ZipFileInterface::METHOD_DEFLATED === $method || $this->isDirectory() ? 20 : 10)
+                )
+            );
+    }
+
+    /**
+     * Clone extra fields
+     */
+    public function __clone()
+    {
+        $this->clone = true;
+        parent::__clone();
+    }
+
+    public function __destruct()
+    {
+        if (!$this->clone && null !== $this->content && is_resource($this->content)) {
+            fclose($this->content);
+            $this->content = null;
+        }
+    }
+}

src/PhpZip/Model/Entry/ZipSourceEntry.php

@@ -0,0 +1,95 @@
+<?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 string
+     */
+    protected $readPassword;
+    /**
+     * @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.
+     *
+     * @return string
+     * @throws ZipException
+     */
+    public function getEntryContent()
+    {
+        if (null === $this->entryContent) {
+            $content = $this->inputStream->readEntryContent($this);
+            if ($this->getSize() < self::MAX_SIZE_CACHED_CONTENT_IN_MEMORY) {
+                $this->entryContent = $content;
+            } else {
+                $this->entryContent = fopen('php://temp', 'rb');
+                fwrite($this->entryContent, $content);
+            }
+            return $content;
+        }
+        if (is_resource($this->entryContent)) {
+            return stream_get_contents($this->entryContent, -1, 0);
+        }
+        return $this->entryContent;
+    }
+
+    /**
+     * Clone extra fields
+     */
+    public function __clone()
+    {
+        $this->clone = true;
+        parent::__clone();
+    }
+
+    public function __destruct()
+    {
+        if (!$this->clone && null !== $this->entryContent && is_resource($this->entryContent)) {
+            fclose($this->entryContent);
+        }
+    }
+}

src/PhpZip/Model/ZipEntryMatcher.php

@@ -0,0 +1,166 @@
+<?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(function ($entry) {
+            return $entry instanceof ZipEntry ? $entry->getName() : $entry;
+        }, $entries);
+        $this->matches = 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[] = $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, function ($entryName) use ($callable) {
+                call_user_func($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->clearEncryption();
+            }
+        });
+    }
+
+    /**
+     * Count elements of an object
+     * @link 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,9 +1,11 @@
 <?php
+
 namespace PhpZip\Model;
 
-use PhpZip\Extra\NtfsExtraField;
-use PhpZip\Extra\WinZipAesEntryExtraField;
+use PhpZip\Extra\Fields\NtfsExtraField;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
 use PhpZip\Util\FilesUtil;
+use PhpZip\ZipFileInterface;
 
 /**
  * Zip info
@@ -36,6 +38,31 @@ class ZipInfo
     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 */
+
     private static $valuesMadeBy = [
         self::MADE_BY_MS_DOS => 'FAT',
         self::MADE_BY_AMIGA => 'Amiga',
@@ -60,7 +87,8 @@ class ZipInfo
     ];
 
     private static $valuesCompressionMethod = [
-        ZipEntry::METHOD_STORED => 'no compression',
+        ZipEntry::UNKNOWN => 'unknown',
+        ZipFileInterface::METHOD_STORED => 'no compression',
         1 => 'shrink',
         2 => 'reduce level 1',
         3 => 'reduce level 2',
@@ -68,7 +96,7 @@ class ZipInfo
         5 => 'reduce level 4',
         6 => 'implode',
         7 => 'reserved for Tokenizing compression algorithm',
-        ZipEntry::METHOD_DEFLATED => 'deflate',
+        ZipFileInterface::METHOD_DEFLATED => 'deflate',
         9 => 'deflate64',
         10 => 'PKWARE Data Compression Library Imploding (old IBM TERSE)',
         11 => 'reserved by PKWARE',
@@ -82,73 +110,77 @@ 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;
-
+    private $name;
     /**
      * @var bool
      */
     private $folder;
-
     /**
      * @var int
      */
     private $size;
-
     /**
      * @var int
      */
     private $compressedSize;
-
     /**
      * @var int
      */
     private $mtime;
-
     /**
      * @var int|null
      */
     private $ctime;
-
     /**
      * @var int|null
      */
     private $atime;
-
     /**
      * @var bool
      */
     private $encrypted;
-
     /**
      * @var string|null
      */
     private $comment;
-
     /**
      * @var int
      */
     private $crc;
-
     /**
      * @var string
      */
-    private $method;
-
+    private $methodName;
+    /**
+     * @var int
+     */
+    private $compressionMethod;
     /**
      * @var string
      */
     private $platform;
-
     /**
      * @var int
      */
     private $version;
+    /**
+     * @var string
+     */
+    private $attributes;
+    /**
+     * @var int|null
+     */
+    private $encryptionMethod;
+    /**
+     * @var int|null
+     */
+    private $compressionLevel;
 
     /**
      * ZipInfo constructor.
@@ -161,42 +193,166 @@ class ZipInfo
         $atime = null;
         $ctime = null;
 
-        $field = $entry->getExtraField(NtfsExtraField::getHeaderId());
-        if ($field !== null && $field instanceof NtfsExtraField) {
+        $field = $entry->getExtraFieldsCollection()->get(NtfsExtraField::getHeaderId());
+        if (null !== $field && $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();
+        $this->size = PHP_INT_SIZE === 4 ?
+            sprintf('%u', $entry->getSize()) :
+            $entry->getSize();
+        $this->compressedSize = PHP_INT_SIZE === 4 ?
+            sprintf('%u', $entry->getCompressedSize()) :
+            $entry->getCompressedSize();
         $this->mtime = $mtime;
         $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();
+
+        $attributes = str_repeat(" ", 12);
+        $externalAttributes = $entry->getExternalAttributes();
+        $externalAttributes = PHP_INT_SIZE === 4 ?
+            sprintf('%u', $externalAttributes) :
+            $externalAttributes;
+        $xattr = (($externalAttributes >> 16) & 0xFFFF);
+        switch ($entry->getPlatform()) {
+            case self::MADE_BY_MS_DOS:
+                // no break
+                /** @noinspection PhpMissingBreakStatementInspection */
+            case self::MADE_BY_WINDOWS_NTFS:
+                if ($entry->getPlatform() != self::MADE_BY_MS_DOS ||
+                    ($xattr & 0700) !=
+                    (0400 |
+                        (!($externalAttributes & 1) << 7) |
+                        (($externalAttributes & 0x10) << 2))
+                ) {
+                    $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) {
+                        $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! */
+
+            // no break
+            default: /* assume Unix-like */
+                switch ($xattr & self::UNX_IFMT) {
+                    case self::UNX_IFDIR:
+                        $attributes[0] = 'd';
+                        break;
+                    case self::UNX_IFREG:
+                        $attributes[0] = '-';
+                        break;
+                    case self::UNX_IFLNK:
+                        $attributes[0] = 'l';
+                        break;
+                    case self::UNX_IFBLK:
+                        $attributes[0] = 'b';
+                        break;
+                    case self::UNX_IFCHR:
+                        $attributes[0] = 'c';
+                        break;
+                    case self::UNX_IFIFO:
+                        $attributes[0] = 'p';
+                        break;
+                    case self::UNX_IFSOCK:
+                        $attributes[0] = 's';
+                        break;
+                    default:
+                        $attributes[0] = '?';
+                        break;
+                }
+                $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) {
+                    $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($attributes);
+    }
+
+    /**
+     * @param ZipEntry $entry
+     * @return int
+     */
+    private static function getMethodId(ZipEntry $entry)
+    {
+        $method = $entry->getMethod();
+        if ($entry->isEncrypted()) {
+            if ($entry->getMethod() === ZipEntry::METHOD_WINZIP_AES) {
+                $field = $entry->getExtraFieldsCollection()->get(WinZipAesEntryExtraField::getHeaderId());
+                if (null !== $field) {
+                    /**
+                     * @var WinZipAesEntryExtraField $field
+                     */
+                    $method = $field->getMethod();
+                }
+            }
+        }
+        return $method;
     }
 
     /**
      * @param ZipEntry $entry
      * @return string
      */
-    public static function getMethodName(ZipEntry $entry)
+    private static function getEntryMethodName(ZipEntry $entry)
     {
         $return = '';
         if ($entry->isEncrypted()) {
-            if ($entry->getMethod() === ZipEntry::WINZIP_AES) {
-                $field = $entry->getExtraField(WinZipAesEntryExtraField::getHeaderId());
+            if ($entry->getMethod() === ZipEntry::METHOD_WINZIP_AES) {
                 $return = ucfirst(self::$valuesCompressionMethod[$entry->getMethod()]);
-                if ($field !== null) {
+                $field = $entry->getExtraFieldsCollection()->get(WinZipAesEntryExtraField::getHeaderId());
+                if (null !== $field) {
                     /**
                      * @var WinZipAesEntryExtraField $field
                      */
@@ -233,33 +389,20 @@ class ZipInfo
     }
 
     /**
-     * @return array
+     * @return string
      */
-    public function toArray()
+    public function getName()
     {
-        return [
-            'path' => $this->getPath(),
-            'folder' => $this->isFolder(),
-            'size' => $this->getSize(),
-            'compressed_size' => $this->getCompressedSize(),
-            'modified' => $this->getMtime(),
-            'created' => $this->getCtime(),
-            'accessed' => $this->getAtime(),
-            'encrypted' => $this->isEncrypted(),
-            'comment' => $this->getComment(),
-            'crc' => $this->getCrc(),
-            'method' => $this->getMethod(),
-            'platform' => $this->getPlatform(),
-            'version' => $this->getVersion()
-        ];
+        return $this->name;
     }
 
     /**
      * @return string
+     * @deprecated use \PhpZip\Model\ZipInfo::getName()
      */
     public function getPath()
     {
-        return $this->path;
+        return $this->getName();
     }
 
     /**
@@ -310,6 +453,14 @@ class ZipInfo
         return $this->atime;
     }
 
+    /**
+     * @return string
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
     /**
      * @return boolean
      */
@@ -336,10 +487,19 @@ 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;
     }
 
     /**
@@ -359,26 +519,76 @@ class ZipInfo
     }
 
     /**
-     * @return string
+     * @return int|null
      */
-    function __toString()
+    public function getEncryptionMethod()
     {
-        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() . '", '
-        . 'Platform="' . $this->getPlatform() . '", '
-        . 'Version=' . $this->getVersion()
-        . '}';
+        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
+     */
+    public function __toString()
+    {
+        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,344 @@
+<?php
+
+namespace PhpZip\Model;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Exception\ZipNotFoundEntry;
+use PhpZip\Model\Entry\ZipChangesEntry;
+use PhpZip\Model\Entry\ZipSourceEntry;
+use PhpZip\ZipFileInterface;
+
+/**
+ * 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 null|string
+     */
+    public function getArchiveComment()
+    {
+        if ($this->archiveCommentChanged) {
+            return $this->archiveCommentChanges;
+        }
+        return $this->archiveComment;
+    }
+
+    /**
+     * @param string $comment
+     * @throws InvalidArgumentException
+     */
+    public function setArchiveComment($comment)
+    {
+        if (null !== $comment && strlen($comment) !== 0) {
+            $comment = (string)$comment;
+            $length = strlen($comment);
+            if (0x0000 > $length || $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 null|string $password
+     */
+    public function setReadPassword($password)
+    {
+        foreach ($this->inputEntries as $entry) {
+            if ($entry->isEncrypted()) {
+                $entry->setPassword($password);
+            }
+        }
+    }
+
+    /**
+     * @param string $entryName
+     * @param string $password
+     * @throws ZipNotFoundEntry
+     */
+    public function setReadPasswordEntry($entryName, $password)
+    {
+        if (!isset($this->inputEntries[$entryName])) {
+            throw new ZipNotFoundEntry('Not found entry ' . $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 null|string $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 InvalidArgumentException
+     * @throws ZipNotFoundEntry
+     */
+    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
+     * @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
+     * @return ZipEntry
+     * @throws ZipNotFoundEntry
+     */
+    public function getEntry($entryName)
+    {
+        $entryName = $entryName instanceof ZipEntry ? $entryName->getName() : (string)$entryName;
+        if (isset($this->outEntries[$entryName])) {
+            return $this->outEntries[$entryName];
+        }
+        throw new ZipNotFoundEntry('Zip entry ' . $entryName . ' not found');
+    }
+
+    /**
+     * @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
+     * @link 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 sizeof($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]) && isset($this->inputEntries[$entry])) {
+            $this->outEntries[$entry] = $this->inputEntries[$entry];
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param int $encryptionMethod
+     * @throws ZipException
+     */
+    public function setEncryptionMethod($encryptionMethod = ZipFileInterface::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/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,298 @@
+<?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.
+     *
+     * @link 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).
+     *
+     * @see seek()
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @throws \RuntimeException on failure.
+     */
+    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
+     *
+     * @return int Position of the file pointer
+     * @throws \RuntimeException on error.
+     */
+    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.
+     *
+     * @link 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.
+     * @return int Returns the number of bytes written to the stream.
+     * @throws \RuntimeException on failure.
+     */
+    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.
+     * @return string Returns the data read from the stream, or an empty string
+     *     if no bytes are available.
+     * @throws \RuntimeException if an error occurs.
+     */
+    public function read($length)
+    {
+        return $this->readable ? fread($this->stream, $length) : "";
+    }
+
+    /**
+     * Returns the remaining contents in a string
+     *
+     * @return string
+     * @throws \RuntimeException if unable to read or an error occurs while
+     *     reading.
+     */
+    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.
+     *
+     * @return void
+     */
+    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,603 @@
+<?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\ZipCryptoException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Exception\ZipUnsupportMethod;
+use PhpZip\Extra\ExtraFieldsCollection;
+use PhpZip\Extra\ExtraFieldsFactory;
+use PhpZip\Extra\Fields\ApkAlignmentExtraField;
+use PhpZip\Extra\Fields\WinZipAesEntryExtraField;
+use PhpZip\Mapper\OffsetPositionMapper;
+use PhpZip\Mapper\PositionMapper;
+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\ZipFileInterface;
+
+/**
+ * Read zip file
+ *
+ * @author Ne-Lexa alexey@nelexa.ru
+ * @license MIT
+ */
+class ZipInputStream implements ZipInputStreamInterface
+{
+    /**
+     * @var resource
+     */
+    protected $in;
+    /**
+     * @var PositionMapper
+     */
+    protected $mapper;
+    /**
+     * @var int The number of bytes in the preamble of this ZIP file.
+     */
+    protected $preamble = 0;
+    /**
+     * @var int The number of bytes in the postamble of this ZIP file.
+     */
+    protected $postamble = 0;
+    /**
+     * @var ZipModel
+     */
+    protected $zipModel;
+
+    /**
+     * ZipInputStream constructor.
+     * @param resource $in
+     * @throws RuntimeException
+     */
+    public function __construct($in)
+    {
+        if (!is_resource($in)) {
+            throw new RuntimeException('$in must be resource');
+        }
+        $this->in = $in;
+        $this->mapper = new PositionMapper();
+    }
+
+    /**
+     * @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 (
+            ZipEntry::LOCAL_FILE_HEADER_SIG !== $signature
+            && EndOfCentralDirectory::ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_SIG !== $signature
+            && EndOfCentralDirectory::END_OF_CENTRAL_DIRECTORY_RECORD_SIG !== $signature
+        ) {
+            throw new ZipException("Expected Local File Header or (ZIP64) End Of Central Directory Record! Signature: " . $signature);
+        }
+    }
+
+    /**
+     * @return EndOfCentralDirectory
+     * @throws ZipException
+     */
+    protected function readEndOfCentralDirectory()
+    {
+        $comment = null;
+        // Search for End of central directory record.
+        $stats = fstat($this->in);
+        $size = $stats['size'];
+        $max = $size - EndOfCentralDirectory::END_OF_CENTRAL_DIRECTORY_RECORD_MIN_LEN;
+        $min = $max >= 0xffff ? $max - 0xffff : 0;
+        for ($endOfCentralDirRecordPos = $max; $endOfCentralDirRecordPos >= $min; $endOfCentralDirRecordPos--) {
+            fseek($this->in, $endOfCentralDirRecordPos, SEEK_SET);
+            // end of central dir signature    4 bytes  (0x06054b50)
+            if (EndOfCentralDirectory::END_OF_CENTRAL_DIRECTORY_RECORD_SIG !== unpack('V', fread($this->in, 4))[1]) {
+                continue;
+            }
+
+            // number of this disk                        - 2 bytes
+            // number of the disk with the start of the
+            //        central directory                   - 2 bytes
+            // total number of entries in the central
+            //        directory on this disk              - 2 bytes
+            // total number of entries in the central
+            //        directory                           - 2 bytes
+            // size of the central directory              - 4 bytes
+            // offset of start of central directory with
+            //        respect to the starting disk number - 4 bytes
+            // ZIP file comment length                    - 2 bytes
+            $data = unpack(
+                'vdiskNo/vcdDiskNo/vcdEntriesDisk/vcdEntries/VcdSize/VcdPos/vcommentLength',
+                fread($this->in, 18)
+            );
+
+            if (0 !== $data['diskNo'] || 0 !== $data['cdDiskNo'] || $data['cdEntriesDisk'] !== $data['cdEntries']) {
+                throw new ZipException(
+                    "ZIP file spanning/splitting is not supported!"
+                );
+            }
+            // .ZIP file comment       (variable size)
+            if (0 < $data['commentLength']) {
+                $comment = fread($this->in, $data['commentLength']);
+            }
+            $this->preamble = $endOfCentralDirRecordPos;
+            $this->postamble = $size - ftell($this->in);
+
+            // Check for ZIP64 End Of Central Directory Locator.
+            $endOfCentralDirLocatorPos = $endOfCentralDirRecordPos - EndOfCentralDirectory::ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_LEN;
+
+            fseek($this->in, $endOfCentralDirLocatorPos, SEEK_SET);
+            // zip64 end of central dir locator
+            // signature                       4 bytes  (0x07064b50)
+            if (
+                0 > $endOfCentralDirLocatorPos ||
+                ftell($this->in) === $size ||
+                EndOfCentralDirectory::ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIG !== unpack('V', fread($this->in, 4))[1]
+            ) {
+                // Seek and check first CFH, probably requiring an offset mapper.
+                $offset = $endOfCentralDirRecordPos - $data['cdSize'];
+                fseek($this->in, $offset, SEEK_SET);
+                $offset -= $data['cdPos'];
+                if (0 !== $offset) {
+                    $this->mapper = new OffsetPositionMapper($offset);
+                }
+                $entryCount = $data['cdEntries'];
+                return new EndOfCentralDirectory($entryCount, $comment);
+            }
+
+            // number of the disk with the
+            // start of the zip64 end of
+            // central directory               4 bytes
+            $zip64EndOfCentralDirectoryRecordDisk = unpack('V', fread($this->in, 4))[1];
+            // relative offset of the zip64
+            // end of central directory record 8 bytes
+            $zip64EndOfCentralDirectoryRecordPos = PackUtil::unpackLongLE(fread($this->in, 8));
+            // total number of disks           4 bytes
+            $totalDisks = unpack('V', fread($this->in, 4))[1];
+            if (0 !== $zip64EndOfCentralDirectoryRecordDisk || 1 !== $totalDisks) {
+                throw new ZipException("ZIP file spanning/splitting is not supported!");
+            }
+            fseek($this->in, $zip64EndOfCentralDirectoryRecordPos, SEEK_SET);
+            // zip64 end of central dir
+            // signature                       4 bytes  (0x06064b50)
+            $zip64EndOfCentralDirSig = unpack('V', fread($this->in, 4))[1];
+            if (EndOfCentralDirectory::ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_SIG !== $zip64EndOfCentralDirSig) {
+                throw new ZipException("Expected ZIP64 End Of Central Directory Record!");
+            }
+            // size of zip64 end of central
+            // directory record                8 bytes
+            // version made by                 2 bytes
+            // version needed to extract       2 bytes
+            fseek($this->in, 12, SEEK_CUR);
+            // number of this disk             4 bytes
+            $diskNo = unpack('V', fread($this->in, 4))[1];
+            // number of the disk with the
+            // start of the central directory  4 bytes
+            $cdDiskNo = unpack('V', fread($this->in, 4))[1];
+            // total number of entries in the
+            // central directory on this disk  8 bytes
+            $cdEntriesDisk = PackUtil::unpackLongLE(fread($this->in, 8));
+            // total number of entries in the
+            // central directory               8 bytes
+            $cdEntries = PackUtil::unpackLongLE(fread($this->in, 8));
+            if (0 !== $diskNo || 0 !== $cdDiskNo || $cdEntriesDisk !== $cdEntries) {
+                throw new ZipException("ZIP file spanning/splitting is not supported!");
+            }
+            if ($cdEntries < 0 || 0x7fffffff < $cdEntries) {
+                throw new ZipException("Total Number Of Entries In The Central Directory out of range!");
+            }
+            // size of the central directory   8 bytes
+            fseek($this->in, 8, SEEK_CUR);
+            // offset of start of central
+            // directory with respect to
+            // the starting disk number        8 bytes
+            $cdPos = PackUtil::unpackLongLE(fread($this->in, 8));
+            // zip64 extensible data sector    (variable size)
+            fseek($this->in, $cdPos, SEEK_SET);
+            $this->preamble = $zip64EndOfCentralDirectoryRecordPos;
+            $entryCount = $cdEntries;
+            $zip64 = true;
+            return new EndOfCentralDirectory($entryCount, $comment, $zip64);
+        }
+        // Start recovering file entries from min.
+        $this->preamble = $min;
+        $this->postamble = $size - $min;
+        return new EndOfCentralDirectory(0, $comment);
+    }
+
+    /**
+     * 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
+     * @return ZipEntry[]
+     * @throws ZipException
+     */
+    protected function mountCentralDirectory(EndOfCentralDirectory $endOfCentralDirectory)
+    {
+        $numEntries = $endOfCentralDirectory->getEntryCount();
+        $entries = [];
+
+        for (; $numEntries > 0; $numEntries--) {
+            $entry = $this->readEntry();
+            // Re-load virtual offset after ZIP64 Extended Information
+            // Extra Field may have been parsed, map it to the real
+            // offset and conditionally update the preamble size from it.
+            $lfhOff = $this->mapper->map($entry->getOffset());
+            $lfhOff = PHP_INT_SIZE === 4 ? sprintf('%u', $lfhOff) : $lfhOff;
+            if ($lfhOff < $this->preamble) {
+                $this->preamble = $lfhOff;
+            }
+            $entries[$entry->getName()] = $entry;
+        }
+
+        if (0 !== $numEntries % 0x10000) {
+            throw new ZipException("Expected " . abs($numEntries) .
+                ($numEntries > 0 ? " more" : " less") .
+                " entries in the Central Directory!");
+        }
+
+        if ($this->preamble + $this->postamble >= fstat($this->in)['size']) {
+            assert(0 === $numEntries);
+            $this->checkZipFileSignature();
+        }
+
+        return $entries;
+    }
+
+    /**
+     * @return ZipEntry
+     * @throws InvalidArgumentException
+     */
+    public function readEntry()
+    {
+        // central file header signature   4 bytes  (0x02014b50)
+        $fileHeaderSig = unpack('V', fread($this->in, 4))[1];
+        if (ZipOutputStreamInterface::CENTRAL_FILE_HEADER_SIG !== $fileHeaderSig) {
+            throw new InvalidArgumentException("Corrupt zip file. Can not read zip entry.");
+        }
+
+        // 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
+        $data = unpack(
+            'vversionMadeBy/vversionNeededToExtract/vgpbf/' .
+            'vrawMethod/VrawTime/VrawCrc/VrawCompressedSize/' .
+            'VrawSize/vfileLength/vextraLength/vcommentLength/' .
+            'VrawInternalAttributes/VrawExternalAttributes/VlfhOff',
+            fread($this->in, 42)
+        );
+
+//        $utf8 = 0 !== ($data['gpbf'] & self::GPBF_UTF8);
+
+        // See appendix D of PKWARE's ZIP File Format Specification.
+        $name = fread($this->in, $data['fileLength']);
+
+        $entry = new ZipSourceEntry($this);
+        $entry->setName($name);
+        $entry->setVersionNeededToExtract($data['versionNeededToExtract']);
+        $entry->setPlatform($data['versionMadeBy'] >> 8);
+        $entry->setMethod($data['rawMethod']);
+        $entry->setGeneralPurposeBitFlags($data['gpbf']);
+        $entry->setDosTime($data['rawTime']);
+        $entry->setCrc($data['rawCrc']);
+        $entry->setCompressedSize($data['rawCompressedSize']);
+        $entry->setSize($data['rawSize']);
+        $entry->setExternalAttributes($data['rawExternalAttributes']);
+        $entry->setOffset($data['lfhOff']); // must be unmapped!
+        if (0 < $data['extraLength']) {
+            $entry->setExtra(fread($this->in, $data['extraLength']));
+        }
+        if (0 < $data['commentLength']) {
+            $entry->setComment(fread($this->in, $data['commentLength']));
+        }
+        return $entry;
+    }
+
+    /**
+     * @param ZipEntry $entry
+     * @return string
+     * @throws ZipException
+     */
+    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 && null === $entry->getPassword()) {
+            throw new ZipException("Can not password from entry " . $entry->getName());
+        }
+
+        $pos = $entry->getOffset();
+        assert(ZipEntry::UNKNOWN !== $pos);
+        $pos = PHP_INT_SIZE === 4 ? sprintf('%u', $pos) : $pos;
+
+        $startPos = $pos = $this->mapper->map($pos);
+        fseek($this->in, $startPos);
+
+        // local file header signature     4 bytes  (0x04034b50)
+        if (ZipEntry::LOCAL_FILE_HEADER_SIG !== unpack('V', fread($this->in, 4))[1]) {
+            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'];
+
+        assert(ZipEntry::UNKNOWN !== $entry->getCrc());
+
+        $method = $entry->getMethod();
+
+        fseek($this->in, $pos);
+
+        // Get raw entry content
+        $compressedSize = $entry->getCompressedSize();
+        $compressedSize = PHP_INT_SIZE === 4 ? sprintf('%u', $compressedSize) : $compressedSize;
+        if ($compressedSize > 0) {
+            $content = fread($this->in, $compressedSize);
+        } else {
+            $content = '';
+        }
+
+        $skipCheckCrc = false;
+        if ($isEncrypted) {
+            if (ZipEntry::METHOD_WINZIP_AES === $method) {
+                // 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(ZipFileInterface::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 (ZipEntry::DATA_DESCRIPTOR_SIG === $localCrc) {
+                        $localCrc = unpack('V', fread($this->in, 4))[1];
+                    }
+                } else {
+                    fseek($this->in, $startPos + 14);
+                    // The CRC32 in the Local File Header.
+                    $localCrc = sprintf('%u', fread($this->in, 4)[1]);
+                    $localCrc = PHP_INT_SIZE === 4 ? sprintf('%u', $localCrc) : $localCrc;
+                }
+
+                $crc = PHP_INT_SIZE === 4 ? sprintf('%u', $entry->getCrc()) : $entry->getCrc();
+
+                if ($crc != $localCrc) {
+                    throw new Crc32Exception($entry->getName(), $crc, $localCrc);
+                }
+            }
+        }
+
+        switch ($method) {
+            case ZipFileInterface::METHOD_STORED:
+                break;
+            case ZipFileInterface::METHOD_DEFLATED:
+                $content = gzinflate($content);
+                break;
+            case ZipFileInterface::METHOD_BZIP2:
+                if (!extension_loaded('bz2')) {
+                    throw new ZipException('Extension bzip2 not install');
+                }
+                $content = bzdecompress($content);
+                break;
+            default:
+                throw new ZipUnsupportMethod($entry->getName() .
+                    " (compression method " . $method . " is not supported)");
+        }
+        if (!$skipCheckCrc) {
+            $localCrc = crc32($content);
+            $localCrc = PHP_INT_SIZE === 4 ? sprintf('%u', $localCrc) : $localCrc;
+            $crc = PHP_INT_SIZE === 4 ? sprintf('%u', $entry->getCrc()) : $entry->getCrc();
+            if ($crc != $localCrc) {
+                if ($isEncrypted) {
+                    throw new ZipCryptoException("Wrong password");
+                }
+                throw new Crc32Exception($entry->getName(), $crc, $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
+     */
+    public function copyEntry(ZipEntry $entry, ZipOutputStreamInterface $out)
+    {
+        $pos = $entry->getOffset();
+        assert(ZipEntry::UNKNOWN !== $pos);
+        $pos = PHP_INT_SIZE === 4 ? sprintf('%u', $pos) : $pos;
+        $pos = $this->mapper->map($pos);
+
+        $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 = fread($this->in, $sourceExtraLength);
+            $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() === ZipFileInterface::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();
+        $offset = PHP_INT_SIZE === 4 ? sprintf('%u', $offset) : $offset;
+        $offset = $this->mapper->map($offset);
+        $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,53 @@
+<?php
+
+namespace PhpZip\Stream;
+
+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();
+
+    /**
+     * @return ZipEntry
+     */
+    public function readEntry();
+
+    /**
+     * @param ZipEntry $entry
+     * @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,563 @@
+<?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\ZipFileInterface;
+
+/**
+ * Write
+ * ip 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
+     * @throws InvalidArgumentException
+     */
+    public function __construct($out, ZipModel $zipModel)
+    {
+        if (!is_resource($out)) {
+            throw new InvalidArgumentException('$out must be resource');
+        }
+        $this->out = $out;
+        $this->zipModel = $zipModel;
+    }
+
+    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() === ZipFileInterface::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 (0xffff < $size) {
+            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->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 (null !== $entryContent) {
+            fwrite($this->out, $entryContent);
+        }
+
+        assert(ZipEntry::UNKNOWN !== $entry->getCrc());
+        assert(ZipEntry::UNKNOWN !== $entry->getSize());
+        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 ($entry->getCompressedSize() != $compressedSize) {
+            throw new ZipException(
+                $entry->getName() . " (expected compressed entry size of "
+                . $entry->getCompressedSize() . " bytes, " .
+                "but is actually " . $compressedSize . " bytes)"
+            );
+        }
+    }
+
+    /**
+     * @param ZipEntry $entry
+     * @return null|string
+     * @throws ZipException
+     */
+    protected function entryCommitChangesAndReturnContent(ZipEntry $entry)
+    {
+        if (ZipEntry::UNKNOWN === $entry->getPlatform()) {
+            $entry->setPlatform(ZipEntry::PLATFORM_UNIX);
+        }
+        if (ZipEntry::UNKNOWN === $entry->getTime()) {
+            $entry->setTime(time());
+        }
+        $method = $entry->getMethod();
+
+        $encrypted = $entry->isEncrypted();
+        // See appendix D of PKWARE's ZIP File Format Specification.
+        $utf8 = true;
+
+        if ($encrypted && null === $entry->getPassword()) {
+            throw new ZipException("Can not password from entry " . $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);
+
+        $skipCrc = false;
+        $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 &&
+                    (
+                        ZipEntry::METHOD_WINZIP_AES === $method ||
+                        $entry->getEncryptionMethod() === ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_128 ||
+                        $entry->getEncryptionMethod() === ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_192 ||
+                        $entry->getEncryptionMethod() === ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_256
+                    )
+                ) {
+                    $field = null;
+                    $method = $entry->getMethod();
+                    $keyStrength = WinZipAesEntryExtraField::getKeyStrangeFromEncryptionMethod($entry->getEncryptionMethod()); // size bits
+
+                    $compressedSize = $entry->getCompressedSize();
+
+                    if (ZipEntry::METHOD_WINZIP_AES === $method) {
+                        /**
+                         * @var WinZipAesEntryExtraField $field
+                         */
+                        $field = $extraFieldsCollection->get(WinZipAesEntryExtraField::getHeaderId());
+                        if (null !== $field) {
+                            $method = $field->getMethod();
+                            if (ZipEntry::UNKNOWN !== $compressedSize) {
+                                $compressedSize -= $field->getKeyStrength() / 2 // salt value
+                                    + 2   // password verification value
+                                    + 10; // authentication code
+                            }
+                            $entry->setMethod($method);
+                        }
+                    }
+                    if (null === $field) {
+                        $field = ExtraFieldsFactory::createWinZipAesEntryExtra();
+                    }
+                    $field->setKeyStrength($keyStrength);
+                    $field->setMethod($method);
+                    $size = $entry->getSize();
+                    if (20 <= $size && ZipFileInterface::METHOD_BZIP2 !== $method) {
+                        $field->setVendorVersion(WinZipAesEntryExtraField::VV_AE_1);
+                    } else {
+                        $field->setVendorVersion(WinZipAesEntryExtraField::VV_AE_2);
+                        $skipCrc = true;
+                    }
+                    $extraFieldsCollection->add($field);
+                    if (ZipEntry::UNKNOWN !== $compressedSize) {
+                        $compressedSize += $field->getKeyStrength() / 2 // salt value
+                            + 2   // password verification value
+                            + 10; // authentication code
+                        $entry->setCompressedSize($compressedSize);
+                    }
+                    if ($skipCrc) {
+                        $entry->setCrc(0);
+                    }
+                }
+
+                switch ($method) {
+                    case ZipFileInterface::METHOD_STORED:
+                        break;
+
+                    case ZipFileInterface::METHOD_DEFLATED:
+                        $entryContent = gzdeflate($entryContent, $entry->getCompressionLevel());
+                        break;
+
+                    case ZipFileInterface::METHOD_BZIP2:
+                        $compressionLevel = $entry->getCompressionLevel() === ZipFileInterface::LEVEL_DEFAULT_COMPRESSION ?
+                            ZipEntry::LEVEL_DEFAULT_BZIP2_COMPRESSION :
+                            $entry->getCompressionLevel();
+                        $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 (ZipFileInterface::METHOD_DEFLATED === $method) {
+                    $bit1 = false;
+                    $bit2 = false;
+                    switch ($entry->getCompressionLevel()) {
+                        case ZipFileInterface::LEVEL_BEST_COMPRESSION:
+                            $bit1 = true;
+                            break;
+
+                        case ZipFileInterface::LEVEL_FAST:
+                            $bit2 = true;
+                            break;
+
+                        case ZipFileInterface::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 (
+                        $entry->getEncryptionMethod() === ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_128 ||
+                        $entry->getEncryptionMethod() === ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_192 ||
+                        $entry->getEncryptionMethod() === ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_256
+                    ) {
+                        if ($skipCrc) {
+                            $entry->setCrc(0);
+                        }
+                        $entry->setMethod(ZipEntry::METHOD_WINZIP_AES);
+
+                        $winZipAesEngine = new WinZipAesEngine($entry);
+                        $entryContent = $winZipAesEngine->encrypt($entryContent);
+                    } elseif ($entry->getEncryptionMethod() === ZipFileInterface::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
+     * @return string
+     */
+    protected function determineBestCompressionMethod(ZipEntry $entry, $content)
+    {
+        if (null !== $content) {
+            $entryContent = gzdeflate($content, $entry->getCompressionLevel());
+            if (strlen($entryContent) < strlen($content)) {
+                $entry->setMethod(ZipFileInterface::METHOD_DEFLATED);
+                return $entryContent;
+            }
+            $entry->setMethod(ZipFileInterface::METHOD_STORED);
+        }
+        return $content;
+    }
+
+    /**
+     * Writes a Central File Header record.
+     *
+     * @param OutputOffsetEntry $outEntry
+     * @throws RuntimeException
+     * @internal param OutPosEntry $entry
+     */
+    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 (ZipEntry::UNKNOWN === ($compressedSize | $size)) {
+            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->getPlatform() << 8) | 63,
+                // version needed to extract       2 bytes
+                $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
+                0,
+                // 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 (0 < $extraSize) {
+            // extra field (variable size)
+            fwrite($this->out, $extra);
+        }
+        if (0 < $commentLength) {
+            // file comment (variable size)
+            fwrite($this->out, $entry->getComment());
+        }
+    }
+
+    protected function writeEndOfCentralDirectoryRecord($centralDirectoryOffset)
+    {
+        $centralDirectoryEntriesCount = count($this->zipModel);
+        $position = ftell($this->out);
+        $centralDirectorySize = $position - $centralDirectoryOffset;
+        $centralDirectoryEntriesZip64 = $centralDirectoryEntriesCount > 0xffff;
+        $centralDirectorySizeZip64 = $centralDirectorySize > 0xffffffff;
+        $centralDirectoryOffsetZip64 = $centralDirectoryOffset > 0xffffffff;
+        $centralDirectoryEntries16 = $centralDirectoryEntriesZip64 ? 0xffff : (int)$centralDirectoryEntriesCount;
+        $centralDirectorySize32 = $centralDirectorySizeZip64 ? 0xffffffff : $centralDirectorySize;
+        $centralDirectoryOffset32 = $centralDirectoryOffsetZip64 ? 0xffffffff : $centralDirectoryOffset;
+        $zip64 // ZIP64 extensions?
+            = $centralDirectoryEntriesZip64
+            || $centralDirectorySizeZip64
+            || $centralDirectoryOffsetZip64;
+        if ($zip64) {
+            // [zip64 end of central directory record]
+            // relative offset of the zip64 end of central directory record
+            $zip64EndOfCentralDirectoryOffset = $position;
+            // zip64 end of central dir
+            // signature                       4 bytes  (0x06064b50)
+            fwrite($this->out, pack('V', EndOfCentralDirectory::ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_SIG));
+            // size of zip64 end of central
+            // directory record                8 bytes
+            fwrite($this->out, PackUtil::packLongLE(EndOfCentralDirectory::ZIP64_END_OF_CENTRAL_DIRECTORY_RECORD_MIN_LEN - 12));
+            // version made by                 2 bytes
+            // version needed to extract       2 bytes
+            //                                 due to potential use of BZIP2 compression
+            // number of this disk             4 bytes
+            // number of the disk with the
+            // start of the central directory  4 bytes
+            fwrite($this->out, pack('vvVV', 63, 46, 0, 0));
+            // total number of entries in the
+            // central directory on this disk  8 bytes
+            fwrite($this->out, PackUtil::packLongLE($centralDirectoryEntriesCount));
+            // total number of entries in the
+            // central directory               8 bytes
+            fwrite($this->out, PackUtil::packLongLE($centralDirectoryEntriesCount));
+            // 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));
+            // zip64 extensible data sector    (variable size)
+
+            // [zip64 end of central directory locator]
+            // signature                       4 bytes  (0x07064b50)
+            // number of the disk with the
+            // start of the zip64 end of
+            // central directory               4 bytes
+            fwrite($this->out, pack('VV', EndOfCentralDirectory::ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIG, 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 = strlen($comment);
+        fwrite(
+            $this->out,
+            pack(
+                'VvvvvVVv',
+                // end of central dir signature    4 bytes  (0x06054b50)
+                EndOfCentralDirectory::END_OF_CENTRAL_DIRECTORY_RECORD_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
+                $centralDirectoryEntries16,
+                // total number of entries in
+                // the central directory           2 bytes
+                $centralDirectoryEntries16,
+                // size of the central directory   4 bytes
+                $centralDirectorySize32,
+                // offset of start of central
+                // directory with respect to
+                // the starting disk number        4 bytes
+                $centralDirectoryOffset32,
+                // .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,7 +1,8 @@
 <?php
+
 namespace PhpZip\Util;
 
-use PhpZip\Exception\ZipException;
+use PhpZip\Exception\RuntimeException;
 
 /**
  * Crypto Utils
@@ -14,9 +15,9 @@ class CryptoUtil
      *
      * @param int $length
      * @return string
-     * @throws ZipException
+     * @throws RuntimeException
      */
-    public static final function randomBytes($length)
+    final public static function randomBytes($length)
     {
         $length = (int)$length;
         if (function_exists('random_bytes')) {
@@ -26,7 +27,7 @@ class CryptoUtil
         } elseif (function_exists('mcrypt_create_iv')) {
             return mcrypt_create_iv($length);
         } else {
-            throw new ZipException('Extension openssl or mcrypt not loaded');
+            throw new RuntimeException('Extension openssl or mcrypt not loaded');
         }
     }
-}
+}

src/PhpZip/Util/DateTimeConverter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util;
 
 use PhpZip\Exception\ZipException;
@@ -39,9 +40,9 @@ class DateTimeConverter
 
         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
         );
@@ -74,4 +75,4 @@ class DateTimeConverter
             $date['mday'] << 16 | $date['hours'] << 11 |
             $date['minutes'] << 5 | $date['seconds'] >> 1);
     }
-}
+}

src/PhpZip/Util/FilesUtil.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util;
 
 use PhpZip\Util\Iterator\IgnoreFilesFilterIterator;
@@ -60,7 +61,7 @@ class FilesUtil
         $inCurrent = 0;
         $chars = str_split($globPattern);
         $regexPattern = '';
-        foreach ($chars AS $currentChar) {
+        foreach ($chars as $currentChar) {
             switch ($currentChar) {
                 case '*':
                     $regexPattern .= ($escaping ? "\\*" : '.*');
@@ -103,19 +104,21 @@ class FilesUtil
                     if ($inCurrent > 0 && !$escaping) {
                         $regexPattern .= ')';
                         $inCurrent--;
-                    } else if ($escaping)
+                    } elseif ($escaping) {
                         $regexPattern = "\\}";
-                    else
+                    } else {
                         $regexPattern = "}";
+                    }
                     $escaping = false;
                     break;
                 case ',':
                     if ($inCurrent > 0 && !$escaping) {
                         $regexPattern .= '|';
-                    } else if ($escaping)
+                    } elseif ($escaping) {
                         $regexPattern .= "\\,";
-                    else
+                    } else {
                         $regexPattern = ",";
+                    }
                     break;
                 default:
                     $escaping = false;
@@ -211,12 +214,15 @@ class FilesUtil
      */
     public static function humanSize($size, $unit = null)
     {
-        if (($unit === null && $size >= 1 << 30) || $unit === "GB")
+        if (($unit === null && $size >= 1 << 30) || $unit === "GB") {
             return number_format($size / (1 << 30), 2) . "GB";
-        if (($unit === null && $size >= 1 << 20) || $unit === "MB")
+        }
+        if (($unit === null && $size >= 1 << 20) || $unit === "MB") {
             return number_format($size / (1 << 20), 2) . "MB";
-        if (($unit === null && $size >= 1 << 10) || $unit === "KB")
+        }
+        if (($unit === null && $size >= 1 << 10) || $unit === "KB") {
             return number_format($size / (1 << 10), 2) . "KB";
+        }
         return number_format($size) . " bytes";
     }
-}
+}

src/PhpZip/Util/Iterator/IgnoreFilesFilterIterator.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util\Iterator;
 
 use PhpZip\Util\StringUtil;
@@ -44,7 +45,7 @@ class IgnoreFilesFilterIterator extends \FilterIterator
         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;
@@ -57,4 +58,4 @@ class IgnoreFilesFilterIterator extends \FilterIterator
         }
         return true;
     }
-}
+}

src/PhpZip/Util/Iterator/IgnoreFilesRecursiveFilterIterator.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util\Iterator;
 
 use PhpZip\Util\StringUtil;
@@ -66,4 +67,4 @@ class IgnoreFilesRecursiveFilterIterator extends \RecursiveFilterIterator
     {
         return new self($this->getInnerIterator()->getChildren(), $this->ignoreFiles);
     }
-}
+}

src/PhpZip/Util/PackUtil.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util;
 
 use PhpZip\Exception\ZipException;
@@ -18,7 +19,9 @@ class PackUtil
      */
     public static function packLongLE($longValue)
     {
-        // TODO test 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;
         $right = 0x00000000ffffffff;
@@ -36,9 +39,27 @@ class PackUtil
      */
     public static function unpackLongLE($value)
     {
-        // TODO test 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 = $int & 0xffffffff;
+            if ($int & 0x80000000) {
+                return $int - 0x100000000;
+            }
+        }
+        return $int;
+    }
+}

src/PhpZip/Util/StringUtil.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PhpZip\Util;
 
 /**
@@ -25,6 +26,6 @@ class StringUtil
     public static function endsWith($haystack, $needle)
     {
         return $needle === "" || (($temp = strlen($haystack) - strlen($needle)) >= 0
-            && strpos($haystack, $needle, $temp) !== false);
+                && strpos($haystack, $needle, $temp) !== false);
     }
-}
+}

src/PhpZip/ZipFileInterface.php

@@ -0,0 +1,633 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\InvalidArgumentException;
+use PhpZip\Exception\ZipException;
+use PhpZip\Exception\ZipNotFoundEntry;
+use PhpZip\Exception\ZipUnsupportMethod;
+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
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException if file doesn't exists.
+     * @throws ZipException             if can't open file.
+     */
+    public function openFile($filename);
+
+    /**
+     * Open zip archive from raw string data.
+     *
+     * @param string $data
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException if data not available.
+     * @throws ZipException             if can't open temp stream.
+     */
+    public function openFromString($data);
+
+    /**
+     * Open zip archive from stream resource
+     *
+     * @param resource $handle
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException Invalid stream resource
+     *         or resource cannot seekable stream
+     */
+    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 null|string $comment
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException Length comment out of range
+     */
+    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
+     * @return bool
+     * @throws ZipNotFoundEntry
+     */
+    public function isDirectory($entryName);
+
+    /**
+     * Returns entry comment.
+     *
+     * @param string $entryName
+     * @return string
+     * @throws ZipNotFoundEntry
+     */
+    public function getEntryComment($entryName);
+
+    /**
+     * Set entry comment.
+     *
+     * @param string $entryName
+     * @param string|null $comment
+     * @return ZipFileInterface
+     * @throws ZipNotFoundEntry
+     */
+    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
+     * @return ZipInfo
+     * @throws ZipNotFoundEntry
+     */
+    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.
+     * @return ZipFileInterface
+     * @throws ZipException
+     */
+    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
+     * @throws InvalidArgumentException If incorrect data or entry name.
+     * @throws ZipUnsupportMethod
+     * @see ZipFileInterface::METHOD_STORED
+     * @see ZipFileInterface::METHOD_DEFLATED
+     * @see ZipFileInterface::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
+     * @throws InvalidArgumentException
+     * @throws ZipUnsupportMethod
+     * @see ZipFileInterface::METHOD_STORED
+     * @see ZipFileInterface::METHOD_DEFLATED
+     * @see ZipFileInterface::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
+     * @throws InvalidArgumentException
+     * @throws ZipUnsupportMethod
+     * @see ZipFileInterface::METHOD_STORED
+     * @see ZipFileInterface::METHOD_DEFLATED
+     * @see ZipFileInterface::METHOD_BZIP2
+     */
+    public function addFromStream($stream, $localName, $compressionMethod = null);
+
+    /**
+     * Add an empty directory in the zip archive.
+     *
+     * @param string $dirName
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException
+     */
+    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
+     * @throws InvalidArgumentException
+     */
+    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
+     * @throws InvalidArgumentException
+     * @throws ZipUnsupportMethod
+     * @see ZipFileInterface::METHOD_STORED
+     * @see ZipFileInterface::METHOD_DEFLATED
+     * @see ZipFileInterface::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
+     * @throws InvalidArgumentException
+     * @throws ZipUnsupportMethod
+     * @see ZipFileInterface::METHOD_STORED
+     * @see ZipFileInterface::METHOD_DEFLATED
+     * @see ZipFileInterface::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
+     * @throws InvalidArgumentException
+     * @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
+     * @throws InvalidArgumentException
+     * @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.
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException
+     * @throws ZipNotFoundEntry
+     */
+    public function rename($oldName, $newName);
+
+    /**
+     * Delete entry by name.
+     *
+     * @param string $entryName Zip Entry name.
+     * @return ZipFileInterface
+     * @throws ZipNotFoundEntry If entry not found.
+     */
+    public function deleteFromName($entryName);
+
+    /**
+     * Delete entries by glob pattern.
+     *
+     * @param string $globPattern Glob pattern
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException
+     * @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
+     * @throws InvalidArgumentException
+     */
+    public function deleteFromRegex($regexPattern);
+
+    /**
+     * Delete all entries
+     * @return ZipFileInterface
+     */
+    public function deleteAll();
+
+    /**
+     * Set compression level for new entries.
+     *
+     * @param int $compressionLevel
+     * @see ZipFileInterface::LEVEL_DEFAULT_COMPRESSION
+     * @see ZipFileInterface::LEVEL_SUPER_FAST
+     * @see ZipFileInterface::LEVEL_FAST
+     * @see ZipFileInterface::LEVEL_BEST_COMPRESSION
+     * @return ZipFileInterface
+     */
+    public function setCompressionLevel($compressionLevel = self::LEVEL_DEFAULT_COMPRESSION);
+
+    /**
+     * @param string $entryName
+     * @param int $compressionLevel
+     * @return ZipFileInterface
+     * @throws ZipException
+     * @see ZipFileInterface::LEVEL_DEFAULT_COMPRESSION
+     * @see ZipFileInterface::LEVEL_SUPER_FAST
+     * @see ZipFileInterface::LEVEL_FAST
+     * @see ZipFileInterface::LEVEL_BEST_COMPRESSION
+     */
+    public function setCompressionLevelEntry($entryName, $compressionLevel);
+
+    /**
+     * @param string $entryName
+     * @param int $compressionMethod
+     * @return ZipFileInterface
+     * @throws ZipException
+     * @see ZipFileInterface::METHOD_STORED
+     * @see ZipFileInterface::METHOD_DEFLATED
+     * @see ZipFileInterface::METHOD_BZIP2
+     */
+    public function setCompressionMethodEntry($entryName, $compressionMethod);
+
+    /**
+     * zipalign is optimization to Android application (APK) files.
+     *
+     * @param int|null $align
+     * @return ZipFileInterface
+     * @link 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 ZipFileInterface::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 ZipFileInterface::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 ZipFileInterface::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
+     * @return ZipFileInterface
+     * @throws InvalidArgumentException
+     * @throws ZipException
+     */
+    public function saveAsFile($filename);
+
+    /**
+     * Save as stream.
+     *
+     * @param resource $handle Output stream resource
+     * @return ZipFileInterface
+     * @throws ZipException
+     */
+    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
+     * @throws InvalidArgumentException
+     */
+    public function outputAsResponse(ResponseInterface $response, $outputFilename, $mimeType = null, $attachment = true);
+
+    /**
+     * Returns the zip archive as a string.
+     * @return string
+     * @throws InvalidArgumentException
+     */
+    public function outputAsString();
+
+    /**
+     * Save and reopen zip archive.
+     * @return ZipFileInterface
+     * @throws ZipException
+     */
+    public function rewrite();
+
+    /**
+     * Close zip archive and release input stream.
+     */
+    public function close();
+}

tests/PhpZip/PhpZipExtResourceTest.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipAuthenticationException;
+
+/**
+ * Some tests from the official extension of php-zip.
+ */
+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
+     */
+    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);
+            self::assertEquals(strlen($contents), $info->getSize());
+        }
+        $zipFile->close();
+
+        self::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
+     */
+    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();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertCount(2, $zipFile);
+        self::assertTrue(isset($zipFile['1.txt']));
+        self::assertTrue(isset($zipFile['2.txt']));
+        self::assertEquals($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
+     */
+    public function testBug40228($filename)
+    {
+        self::assertTrue(mkdir($this->outputDirname, 0755, true));
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->extractTo($this->outputDirname);
+        $zipFile->close();
+
+        self::assertTrue(is_dir($this->outputDirname . '/test/empty'));
+    }
+
+    public function provideBug40228()
+    {
+        return [
+            [__DIR__ . '/php-zip-ext-test-resources/bug40228.zip'],
+            [__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
+     * @expectedException \PhpZip\Exception\Crc32Exception
+     * @expectedExceptionMessage file1
+     */
+    public function testBug49072()
+    {
+        $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
+     * @expectedException \PhpZip\Exception\ZipAuthenticationException
+     * @expectedExceptionMessage Bad password for entry bug70752.txt
+     */
+    public function testBug70752()
+    {
+        $filename = __DIR__ . '/php-zip-ext-test-resources/bug70752.zip';
+
+        self::assertTrue(mkdir($this->outputDirname, 0755, true));
+
+        $zipFile = new ZipFile();
+        try {
+            $zipFile->openFile($filename);
+            $zipFile->setReadPassword('bar');
+            $zipFile->extractTo($this->outputDirname);
+            self::markTestIncomplete('failed test');
+        } catch (ZipAuthenticationException $exception) {
+            self::assertFalse(file_exists($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
+     */
+    public function testPecl12414()
+    {
+        $filename = __DIR__ . '/php-zip-ext-test-resources/pecl12414.zip';
+
+        $entryName = 'MYLOGOV2.GFX';
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+
+        $info = $zipFile->getEntryInfo($entryName);
+        self::assertTrue($info->getSize() > 0);
+
+        $contents = $zipFile[$entryName];
+        self::assertEquals(strlen($contents), $info->getSize());
+
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipAlignTest.php

@@ -0,0 +1,147 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Util\CryptoUtil;
+
+/**
+ * Test ZipAlign
+ */
+class ZipAlignTest extends ZipTestCase
+{
+    public function testApkAlignedAndSetZipAlignAndReSave()
+    {
+        $filename = __DIR__ . '/resources/test.apk';
+
+        self::assertCorrectZipArchive($filename);
+        $result = self::doZipAlignVerify($filename);
+        if (null !== $result) {
+            self::assertTrue($result);
+        }
+
+        $zipFile = new ZipFile();
+        $zipFile->openFile($filename);
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+        $result = self::doZipAlignVerify($this->outputFilename, true);
+        if (null !== $result) {
+            self::assertTrue($result);
+        }
+    }
+
+    /**
+     * Test zip alignment.
+     */
+    public function testZipAlignSourceZip()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile->addFromString(
+                'entry' . $i . '.txt',
+                CryptoUtil::randomBytes(mt_rand(100, 4096)),
+                ZipFileInterface::METHOD_STORED
+            );
+        }
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $result = self::doZipAlignVerify($this->outputFilename);
+        if ($result === null) {
+            return;
+        } // zip align not installed
+
+        // check not zip align
+        self::assertFalse($result);
+
+        $zipFile->openFile($this->outputFilename);
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $result = self::doZipAlignVerify($this->outputFilename, true);
+        self::assertNotNull($result);
+
+        // check zip align
+        self::assertTrue($result);
+    }
+
+    public function testZipAlignNewFiles()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile->addFromString(
+                'entry' . $i . '.txt',
+                CryptoUtil::randomBytes(mt_rand(100, 4096)),
+                ZipFileInterface::METHOD_STORED
+            );
+        }
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $result = self::doZipAlignVerify($this->outputFilename);
+        if ($result === null) {
+            return;
+        } // zip align not installed
+        // check not zip align
+        self::assertTrue($result);
+    }
+
+    public function testZipAlignFromModifiedZipArchive()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile->addFromString(
+                'entry' . $i . '.txt',
+                CryptoUtil::randomBytes(mt_rand(100, 4096)),
+                ZipFileInterface::METHOD_STORED
+            );
+        }
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $result = self::doZipAlignVerify($this->outputFilename);
+        if ($result === null) {
+            return;
+        } // zip align not installed
+
+        // check not zip align
+        self::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',
+                CryptoUtil::randomBytes(mt_rand(100, 4096)),
+                $isStored ?
+                    ZipFileInterface::METHOD_STORED :
+                    ZipFileInterface::METHOD_DEFLATED
+            );
+        }
+        $zipFile->setZipAlign(4);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $result = self::doZipAlignVerify($this->outputFilename, true);
+        self::assertNotNull($result);
+
+        // check zip align
+        self::assertTrue($result);
+    }
+}

tests/PhpZip/ZipFileAddDirTest.php

@@ -0,0 +1,383 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Util\Iterator\IgnoreFilesFilterIterator;
+use PhpZip\Util\Iterator\IgnoreFilesRecursiveFilterIterator;
+
+/**
+ * Test add directory to zip archive.
+ */
+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);
+            }
+        }
+    }
+
+    protected static function assertFilesResult(ZipFileInterface $zipFile, array $actualResultFiles = [], $localPath = '/')
+    {
+        $localPath = rtrim($localPath, '/');
+        $localPath = empty($localPath) ? "" : $localPath . '/';
+        self::assertEquals(sizeof($zipFile), sizeof($actualResultFiles));
+        $actualResultFiles = array_flip($actualResultFiles);
+        foreach (self::$files as $file => $content) {
+            $zipEntryName = $localPath . $file;
+            if (isset($actualResultFiles[$file])) {
+                self::assertTrue(isset($zipFile[$zipEntryName]));
+                self::assertEquals($zipFile[$zipEntryName], $content);
+                unset($actualResultFiles[$file]);
+            } else {
+                self::assertFalse(isset($zipFile[$zipEntryName]));
+            }
+        }
+        self::assertEmpty($actualResultFiles);
+    }
+
+    public function testAddDirWithLocalPath()
+    {
+        $localPath = 'to/path';
+
+        $zipFile = new ZipFile();
+        $zipFile->addDir($this->outputDirname, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, [
+            '.hidden',
+            'text file.txt',
+            'Текстовый документ.txt',
+            'empty dir/',
+        ], $localPath);
+        $zipFile->close();
+    }
+
+    public function testAddDirWithoutLocalPath()
+    {
+        $zipFile = new ZipFile();
+        $zipFile->addDir($this->outputDirname);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, [
+            '.hidden',
+            'text file.txt',
+            'Текстовый документ.txt',
+            'empty dir/',
+        ]);
+        $zipFile->close();
+    }
+
+    public function testAddFilesFromIterator()
+    {
+        $localPath = 'to/project';
+
+        $directoryIterator = new \DirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($directoryIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, [
+            '.hidden',
+            'text file.txt',
+            'Текстовый документ.txt',
+            'empty dir/',
+        ], $localPath);
+        $zipFile->close();
+    }
+
+    public function testAddFilesFromIteratorEmptyLocalPath()
+    {
+        $localPath = '';
+
+        $directoryIterator = new \DirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($directoryIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, [
+            '.hidden',
+            'text file.txt',
+            'Текстовый документ.txt',
+            'empty dir/',
+        ]);
+        $zipFile->close();
+    }
+
+    public function testAddFilesFromRecursiveIterator()
+    {
+        $localPath = 'to/project';
+
+        $directoryIterator = new \RecursiveDirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromIterator($directoryIterator, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, array_keys(self::$files), $localPath);
+        $zipFile->close();
+    }
+
+    public function testAddRecursiveDirWithLocalPath()
+    {
+        $localPath = 'to/path';
+
+        $zipFile = new ZipFile();
+        $zipFile->addDirRecursive($this->outputDirname, $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, array_keys(self::$files), $localPath);
+        $zipFile->close();
+    }
+
+    public function testAddRecursiveDirWithoutLocalPath()
+    {
+        $zipFile = new ZipFile();
+        $zipFile->addDirRecursive($this->outputDirname);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, array_keys(self::$files));
+        $zipFile->close();
+    }
+
+    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();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, [
+            '.hidden',
+            'text file.txt',
+        ], $localPath);
+        $zipFile->close();
+    }
+
+    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();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::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
+     */
+    public function testAddFilesFromGlob()
+    {
+        $localPath = '/';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromGlob($this->outputDirname, '**.{txt,jpg}', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, [
+            'text file.txt',
+            'Текстовый документ.txt',
+        ], $localPath);
+        $zipFile->close();
+    }
+
+    /**
+     * Create archive and add recursively files from glob pattern
+     */
+    public function testAddFilesFromGlobRecursive()
+    {
+        $localPath = '/';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromGlobRecursive($this->outputDirname, '**.{txt,jpg}', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::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
+     */
+    public function testAddFilesFromRegex()
+    {
+        $localPath = 'path';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromRegex($this->outputDirname, '~\.(txt|jpe?g)$~i', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, [
+            'text file.txt',
+            'Текстовый документ.txt',
+        ], $localPath);
+        $zipFile->close();
+    }
+
+    /**
+     * Create archive and add files recursively from regex pattern
+     */
+    public function testAddFilesFromRegexRecursive()
+    {
+        $localPath = '/';
+
+        $zipFile = new ZipFile();
+        $zipFile->addFilesFromRegexRecursive($this->outputDirname, '~\.(txt|jpe?g)$~i', $localPath);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::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();
+    }
+
+    public function testArrayAccessAddDir()
+    {
+        $localPath = 'path/to';
+        $iterator = new \RecursiveDirectoryIterator($this->outputDirname);
+
+        $zipFile = new ZipFile();
+        $zipFile[$localPath] = $iterator;
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertFilesResult($zipFile, array_keys(self::$files), $localPath);
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipMatcherTest.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Model\ZipEntryMatcher;
+use PhpZip\Model\ZipInfo;
+use PhpZip\Util\CryptoUtil;
+
+class ZipMatcherTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMatcher()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile[$i] = $i;
+        }
+
+        $matcher = $zipFile->matcher();
+        self::assertInstanceOf(ZipEntryMatcher::class, $matcher);
+
+        $this->assertTrue(is_array($matcher->getMatches()));
+        $this->assertCount(0, $matcher);
+
+        $matcher->add(1)->add(10)->add(20);
+        $this->assertCount(3, $matcher);
+        $this->assertEquals($matcher->getMatches(), ['1', '10', '20']);
+
+        $matcher->delete();
+        $this->assertCount(97, $zipFile);
+        $this->assertCount(0, $matcher);
+
+        $matcher->match('~^[2][1-5]|[3][6-9]|40$~s');
+        $this->assertCount(10, $matcher);
+        $actualMatches = [
+            '21', '22', '23', '24', '25',
+            '36', '37', '38', '39',
+            '40'
+        ];
+        $this->assertEquals($matcher->getMatches(), $actualMatches);
+        $matcher->setPassword('qwerty');
+        $info = $zipFile->getAllInfo();
+        array_walk($info, function (ZipInfo $zipInfo) use ($actualMatches) {
+            self::assertEquals($zipInfo->isEncrypted(), in_array($zipInfo->getName(), $actualMatches));
+        });
+
+        $matcher->all();
+        $this->assertCount(count($zipFile), $matcher);
+
+        $expectedNames = [];
+        $matcher->invoke(function ($entryName) use (&$expectedNames) {
+            $expectedNames[] = $entryName;
+        });
+        $this->assertEquals($expectedNames, $matcher->getMatches());
+
+        $zipFile->close();
+    }
+
+    public function testDocsExample()
+    {
+        $zipFile = new ZipFile();
+        for ($i = 0; $i < 100; $i++) {
+            $zipFile['file_'.$i.'.jpg'] = CryptoUtil::randomBytes(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) {
+            self::assertTrue(isset($zipFile[$name]));
+        }
+
+        $matcher = $zipFile->matcher();
+        $matcher->match('~^file_(1|5)\d+~');
+        self::assertEquals($matcher->getMatches(), $renameEntriesArray);
+
+        $matcher->invoke(function ($entryName) use ($zipFile) {
+            $newName = preg_replace('~\.(jpe?g)$~i', '.no_optimize.$1', $entryName);
+            $zipFile->rename($entryName, $newName);
+        });
+
+        foreach ($renameEntriesArray as $name) {
+            self::assertFalse(isset($zipFile[$name]));
+
+            $pathInfo = pathinfo($name);
+            $newName = $pathInfo['filename'].'.no_optimize.'.$pathInfo['extension'];
+            self::assertTrue(isset($zipFile[$newName]));
+        }
+
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipPasswordTest.php

@@ -0,0 +1,349 @@
+<?php
+
+namespace PhpZip;
+
+use PhpZip\Exception\ZipAuthenticationException;
+use PhpZip\Model\ZipInfo;
+use PhpZip\Util\CryptoUtil;
+
+/**
+ * Tests with zip password.
+ */
+class ZipPasswordTest extends ZipFileAddDirTest
+{
+    /**
+     * Test archive password.
+     */
+    public function testSetPassword()
+    {
+        if (PHP_INT_SIZE === 4) {
+            $this->markTestSkipped('Skip test for 32-bit system. Not support Traditional PKWARE Encryption.');
+        }
+
+        $password = base64_encode(CryptoUtil::randomBytes(100));
+        $badPassword = "bad password";
+
+        // create encryption password with ZipCrypto
+        $zipFile = new ZipFile();
+        $zipFile->addDir(__DIR__);
+        $zipFile->setPassword($password, ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename, $password);
+
+        // check bad password for ZipCrypto
+        $zipFile->openFile($this->outputFilename);
+        $zipFile->setReadPassword($badPassword);
+        foreach ($zipFile->getListFiles() as $entryName) {
+            try {
+                $zipFile[$entryName];
+                self::fail("Expected Exception has not been raised.");
+            } catch (ZipAuthenticationException $ae) {
+                self::assertNotNull($ae);
+            }
+        }
+
+        // check correct password for ZipCrypto
+        $zipFile->setReadPassword($password);
+        foreach ($zipFile->getAllInfo() as $info) {
+            self::assertTrue($info->isEncrypted());
+            self::assertContains('ZipCrypto', $info->getMethodName());
+            $decryptContent = $zipFile[$info->getName()];
+            self::assertNotEmpty($decryptContent);
+            self::assertContains('<?php', $decryptContent);
+        }
+
+        // change encryption method to WinZip Aes and update file
+        $zipFile->setPassword($password, ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES);
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::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];
+                self::fail("Expected Exception has not been raised.");
+            } catch (ZipAuthenticationException $ae) {
+                self::assertNotNull($ae);
+            }
+        }
+
+        // set correct password WinZip AES
+        $zipFile->setReadPassword($password);
+        foreach ($zipFile->getAllInfo() as $info) {
+            self::assertTrue($info->isEncrypted());
+            self::assertContains('WinZip', $info->getMethodName());
+            $decryptContent = $zipFile[$info->getName()];
+            self::assertNotEmpty($decryptContent);
+            self::assertContains('<?php', $decryptContent);
+        }
+
+        // clear password
+        $zipFile->addFromString('file1', '');
+        $zipFile->disableEncryption();
+        $zipFile->addFromString('file2', '');
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename);
+
+        // check remove password
+        $zipFile->openFile($this->outputFilename);
+        foreach ($zipFile->getAllInfo() as $info) {
+            self::assertFalse($info->isEncrypted());
+        }
+        $zipFile->close();
+    }
+
+    public function testTraditionalEncryption()
+    {
+        if (PHP_INT_SIZE === 4) {
+            $this->markTestSkipped('Skip test for 32-bit system. Not support Traditional PKWARE Encryption.');
+        }
+
+        $password = base64_encode(CryptoUtil::randomBytes(50));
+
+        $zip = new ZipFile();
+        $zip->addDirRecursive($this->outputDirname);
+        $zip->setPassword($password, ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL);
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        self::assertCorrectZipArchive($this->outputFilename, $password);
+
+        $zip->openFile($this->outputFilename);
+        $zip->setReadPassword($password);
+        self::assertFilesResult($zip, array_keys(self::$files));
+        foreach ($zip->getAllInfo() as $info) {
+            if (!$info->isFolder()) {
+                self::assertTrue($info->isEncrypted());
+                self::assertContains('ZipCrypto', $info->getMethodName());
+            }
+        }
+        $zip->close();
+    }
+
+    /**
+     * @dataProvider winZipKeyStrengthProvider
+     * @param int $encryptionMethod
+     * @param int $bitSize
+     */
+    public function testWinZipAesEncryption($encryptionMethod, $bitSize)
+    {
+        $password = base64_encode(CryptoUtil::randomBytes(50));
+
+        $zip = new ZipFile();
+        $zip->addDirRecursive($this->outputDirname);
+        $zip->setPassword($password, $encryptionMethod);
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        self::assertCorrectZipArchive($this->outputFilename, $password);
+
+        $zip->openFile($this->outputFilename);
+        $zip->setReadPassword($password);
+        self::assertFilesResult($zip, array_keys(self::$files));
+        foreach ($zip->getAllInfo() as $info) {
+            if (!$info->isFolder()) {
+                self::assertTrue($info->isEncrypted());
+                self::assertEquals($info->getEncryptionMethod(), $encryptionMethod);
+                self::assertContains('WinZip AES-' . $bitSize, $info->getMethodName());
+            }
+        }
+        $zip->close();
+    }
+
+    /**
+     * @return array
+     */
+    public function winZipKeyStrengthProvider()
+    {
+        return [
+            [ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_128, 128],
+            [ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_192, 192],
+            [ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES, 256],
+            [ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES_256, 256],
+        ];
+    }
+
+    public function testEncryptionEntries()
+    {
+        if (PHP_INT_SIZE === 4) {
+            $this->markTestSkipped('Skip test for 32-bit system. Not support Traditional PKWARE Encryption.');
+        }
+
+        $password1 = '353442434235424234';
+        $password2 = 'adgerhvrwjhqqehtqhkbqrgewg';
+
+        $zip = new ZipFile();
+        $zip->addDir($this->outputDirname);
+        $zip->setPasswordEntry('.hidden', $password1, ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL);
+        $zip->setPasswordEntry('text file.txt', $password2, ZipFileInterface::ENCRYPTION_METHOD_WINZIP_AES);
+        $zip->saveAsFile($this->outputFilename);
+        $zip->close();
+
+        $zip->openFile($this->outputFilename);
+        $zip->setReadPasswordEntry('.hidden', $password1);
+        $zip->setReadPasswordEntry('text file.txt', $password2);
+        self::assertFilesResult($zip, [
+            '.hidden',
+            'text file.txt',
+            'Текстовый документ.txt',
+            'empty dir/',
+        ]);
+
+        $info = $zip->getEntryInfo('.hidden');
+        self::assertTrue($info->isEncrypted());
+        self::assertContains('ZipCrypto', $info->getMethodName());
+
+        $info = $zip->getEntryInfo('text file.txt');
+        self::assertTrue($info->isEncrypted());
+        self::assertContains('WinZip AES', $info->getMethodName());
+
+        self::assertFalse($zip->getEntryInfo('Текстовый документ.txt')->isEncrypted());
+        self::assertFalse($zip->getEntryInfo('empty dir/')->isEncrypted());
+
+        $zip->close();
+    }
+
+    public function testEncryptionEntriesWithDefaultPassword()
+    {
+        if (PHP_INT_SIZE === 4) {
+            $this->markTestSkipped('Skip test for 32-bit system. Not support Traditional PKWARE Encryption.');
+        }
+
+        $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, ZipFileInterface::ENCRYPTION_METHOD_TRADITIONAL);
+        $zip->setPasswordEntry('text file.txt', $password2, ZipFileInterface::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);
+        self::assertFilesResult($zip, [
+            '.hidden',
+            'text file.txt',
+            'Текстовый документ.txt',
+            'empty dir/',
+        ]);
+
+        $info = $zip->getEntryInfo('.hidden');
+        self::assertTrue($info->isEncrypted());
+        self::assertContains('ZipCrypto', $info->getMethodName());
+
+        $info = $zip->getEntryInfo('text file.txt');
+        self::assertTrue($info->isEncrypted());
+        self::assertContains('WinZip AES', $info->getMethodName());
+
+        $info = $zip->getEntryInfo('Текстовый документ.txt');
+        self::assertTrue($info->isEncrypted());
+        self::assertContains('WinZip AES', $info->getMethodName());
+
+        self::assertFalse($zip->getEntryInfo('empty dir/')->isEncrypted());
+
+        $zip->close();
+    }
+
+    /**
+     * @expectedException \PhpZip\Exception\ZipException
+     * @expectedExceptionMessage Invalid encryption method
+     */
+    public function testSetEncryptionMethodInvalid()
+    {
+        $zipFile = new ZipFile();
+        $encryptionMethod = 9999;
+        $zipFile->setPassword('pass', $encryptionMethod);
+        $zipFile['entry'] = 'content';
+        $zipFile->outputAsString();
+    }
+
+    public function testEntryPassword()
+    {
+        $zipFile = new ZipFile();
+        $zipFile->setPassword('pass');
+        $zipFile['file'] = 'content';
+        self::assertFalse($zipFile->getEntryInfo('file')->isEncrypted());
+        for ($i = 1; $i <= 10; $i++) {
+            $zipFile['file' . $i] = 'content';
+            if ($i < 6) {
+                $zipFile->setPasswordEntry('file' . $i, 'pass');
+                self::assertTrue($zipFile->getEntryInfo('file' . $i)->isEncrypted());
+            } else {
+                self::assertFalse($zipFile->getEntryInfo('file' . $i)->isEncrypted());
+            }
+        }
+        $zipFile->disableEncryptionEntry('file3');
+        self::assertFalse($zipFile->getEntryInfo('file3')->isEncrypted());
+        self::asserttrue($zipFile->getEntryInfo('file2')->isEncrypted());
+        $zipFile->disableEncryption();
+        $infoList = $zipFile->getAllInfo();
+        array_walk($infoList, function (ZipInfo $zipInfo) {
+            self::assertFalse($zipInfo->isEncrypted());
+        });
+        $zipFile->close();
+    }
+
+    /**
+     * @expectedException \PhpZip\Exception\ZipException
+     * @expectedExceptionMessage Invalid encryption method
+     */
+    public function testInvalidEncryptionMethodEntry()
+    {
+        $zipFile = new ZipFile();
+        $zipFile->addFromString('file', 'content', ZipFileInterface::METHOD_STORED);
+        $zipFile->setPasswordEntry('file', 'pass', 99);
+    }
+
+    public function testArchivePasswordUpdateWithoutSetReadPassword()
+    {
+        $zipFile = new ZipFile();
+        $zipFile['file1'] = 'content';
+        $zipFile['file2'] = 'content';
+        $zipFile['file3'] = 'content';
+        $zipFile->setPassword('password');
+        $zipFile->saveAsFile($this->outputFilename);
+        $zipFile->close();
+
+        self::assertCorrectZipArchive($this->outputFilename, 'password');
+
+        $zipFile->openFile($this->outputFilename);
+        self::assertCount(3, $zipFile);
+        foreach ($zipFile->getAllInfo() as $info) {
+            self::assertTrue($info->isEncrypted());
+        }
+        unset($zipFile['file3']);
+        $zipFile['file4'] = 'content';
+        $zipFile->rewrite();
+
+        self::assertCorrectZipArchive($this->outputFilename, 'password');
+
+        self::assertCount(3, $zipFile);
+        self::assertFalse(isset($zipFile['file3']));
+        self::assertTrue(isset($zipFile['file4']));
+        self::assertTrue($zipFile->getEntryInfo('file1')->isEncrypted());
+        self::assertTrue($zipFile->getEntryInfo('file2')->isEncrypted());
+        self::assertFalse($zipFile->getEntryInfo('file4')->isEncrypted());
+        self::assertEquals($zipFile['file4'], 'content');
+
+        $zipFile->extractTo($this->outputDirname, ['file4']);
+
+        self::assertTrue(file_exists($this->outputDirname . DIRECTORY_SEPARATOR . 'file4'));
+        self::assertEquals(file_get_contents($this->outputDirname . DIRECTORY_SEPARATOR . 'file4'), $zipFile['file4']);
+
+        $zipFile->close();
+    }
+}

tests/PhpZip/ZipTestCase.php

@@ -1,26 +1,100 @@
 <?php
+
 namespace PhpZip;
 
+use PhpZip\Model\EndOfCentralDirectory;
+use PhpZip\Util\FilesUtil;
+
 /**
  * PHPUnit test case and helper methods.
  */
 class ZipTestCase extends \PHPUnit_Framework_TestCase
 {
+
+    /**
+     * @var string
+     */
+    protected $outputFilename;
+    /**
+     * @var string
+     */
+    protected $outputDirname;
+
+    /**
+     * Before test
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $id = uniqid('phpzip');
+        $tempDir = sys_get_temp_dir() . '/phpunit-phpzip';
+        if (!is_dir($tempDir)) {
+            if (!mkdir($tempDir, 0755, true)) {
+                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 (DIRECTORY_SEPARATOR !== '\\' && `which unzip`) {
+            $command = "unzip";
+            if ($password !== null) {
+                $command .= " -P " . escapeshellarg($password);
+            }
+            $command .= " -t " . escapeshellarg($filename);
+            exec($command, $output, $returnCode);
 
             $output = implode(PHP_EOL, $output);
 
-            self::assertEquals($returnCode, 0);
-            self::assertNotContains('zip error', $output);
-            self::assertContains(' OK', $output);
+            if ($password !== null && $returnCode === 81) {
+                if (`which 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);
+
+                    $output = implode(PHP_EOL, $output);
+
+                    self::assertEquals($returnCode, 0);
+                    self::assertNotContains(' Errors', $output);
+                    self::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 {
+                self::assertEquals($returnCode, 0, $output);
+                self::assertNotContains('incorrect password', $output);
+                self::assertContains(' OK', $output);
+                self::assertContains('No errors', $output);
+            }
         }
     }
 
@@ -38,8 +112,26 @@ class ZipTestCase extends \PHPUnit_Framework_TestCase
 
             self::assertContains('Empty zipfile', $output);
         }
-        $actualEmptyZipData = pack('VVVVVv', ZipConstants::END_OF_CENTRAL_DIRECTORY_RECORD_SIG, 0, 0, 0, 0, 0);
+        $actualEmptyZipData = pack('VVVVVv', EndOfCentralDirectory::END_OF_CENTRAL_DIRECTORY_RECORD_SIG, 0, 0, 0, 0, 0);
         self::assertEquals(file_get_contents($filename), $actualEmptyZipData);
     }
 
-}
+    /**
+     * @param string $filename
+     * @param bool $showErrors
+     * @return bool|null If null - can not install zipalign
+     */
+    public static function doZipAlignVerify($filename, $showErrors = false)
+    {
+        if (DIRECTORY_SEPARATOR !== '\\' && `which zipalign`) {
+            exec("zipalign -c -v 4 " . escapeshellarg($filename), $output, $returnCode);
+            if ($showErrors && $returnCode !== 0) {
+                fwrite(STDERR, implode(PHP_EOL, $output));
+            }
+            return $returnCode === 0;
+        } else {
+            fwrite(STDERR, 'Can not find program "zipalign" for test' . PHP_EOL);
+            return null;
+        }
+    }
+}