Merge branch 'release/2.1.0'

Tagging version 2.0.3 2.0.3

.gitignore

@@ -1,3 +1,4 @@
-/vendor/
+/vendor
 *.iml
-/.idea/
+/.idea
+/composer.lock

README.md

@@ -4,12 +4,14 @@
 
 The library supports `ZIP64`, `zipalign`, `Traditional PKWARE Encryption` and `WinZIP AES Encryption`.
 
-The library does not require extension `php-xml` and class `ZipArchive`.
+ZIP64 extensions are automatically and transparently activated when reading or writing ZIP files of more than 4 GB size.
+
+The library does not require extension `php-zip` and class `ZipArchive`.
 
 Requirements
 ------------
 - `PHP` >= 5.4 (64 bit)
-- Php-extension `mbstring`
+- PHP-extension `mbstring`
 - Optional php-extension `bzip2` for BZIP2 compression.
 - Optional php-extension `openssl` or `mcrypt` for `WinZip Aes Encryption` support.
 
@@ -95,7 +97,7 @@ Get entry info.
 ```php
 $zipInfo = $zipFile->getEntryInfo('file.txt');
 echo $zipInfo . PHP_EOL;
-// ZipInfo {Path="file.txt", Size=9.77KB, Compressed size=2.04KB, Modified time=2016-09-24T19:25:10+03:00, Crc=0x4b5ab5c7, Method="Deflate", Platform="UNIX", Version=20}
+// ZipInfo {Path="file.txt", Size=9.77KB, Compressed size=2.04KB, Modified time=2016-09-24T19:25:10+03:00, Crc=0x4b5ab5c7, Method="Deflate", Attributes="-rw-r--r--", Platform="UNIX", Version=20}
 print_r($zipInfo);
 //PhpZip\Model\ZipInfo Object
 //(
@@ -112,6 +114,7 @@ print_r($zipInfo);
 //    [method:PhpZip\Model\ZipInfo:private] => Deflate
 //    [platform:PhpZip\Model\ZipInfo:private] => UNIX
 //    [version:PhpZip\Model\ZipInfo:private] => 20
+//    [attributes:PhpZip\Model\ZipInfo:private] => -rw-r--r--
 //)
 ```
 Get info for all entries.
@@ -362,7 +365,7 @@ $zipOutputFile->saveAsFile($filename);
 ```
 Save archive to a stream.
 ```php
-$handle = fopen($filename, 'w+b);
+$handle = fopen($filename, 'w+b');
 $autoCloseResource = true;
 $zipOutputFile->saveAsStream($handle, $autoCloseResource);
 if(!$autoCloseResource){

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "nelexa/zip",
-  "description": "Zip files CRUD. Open, create, update, extract and get info tool. Support read and write encrypted archives. Support ZIP64 ext and zip align. Alternative ZipArchive. It does not require php-zip extension.",
+  "description": "Zip files CRUD. Open, create, update, extract and get info tool. Supports appending to existing ZIP files, WinZip AES encryption, Traditional PKWARE Encryption, ZipAlign tool, BZIP2 compression, external file attributes and ZIP64 extensions. Alternative ZipArchive. It does not require php-zip extension.",
   "type": "library",
   "keywords": [
     "zip",

src/PhpZip/Model/ZipInfo.php

@@ -36,6 +36,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',
@@ -150,6 +175,11 @@ class ZipInfo
      */
     private $version;
 
+    /**
+     * @var string
+     */
+    private $attributes;
+
     /**
      * ZipInfo constructor.
      *
@@ -183,6 +213,88 @@ class ZipInfo
         $this->method = self::getMethodName($entry);
         $this->platform = self::getPlatformName($entry);
         $this->version = $entry->getVersionNeededToExtract();
+
+        $attribs = str_repeat(" ", 12);
+        $xattr = (($entry->getRawExternalAttributes() >> 16) & 0xFFFF);
+        switch ($entry->getPlatform()) {
+            case self::MADE_BY_MS_DOS:
+            case self::MADE_BY_WINDOWS_NTFS:
+                if ($entry->getPlatform() != self::MADE_BY_MS_DOS ||
+                    ($xattr & 0700) !=
+                    (0400 |
+                        (!($entry->getRawExternalAttributes() & 1) << 7) |
+                        (($entry->getRawExternalAttributes() & 0x10) << 2))
+                ) {
+                    $xattr = $entry->getRawExternalAttributes() & 0xFF;
+                    $attribs = ".r.-...     ";
+                    $attribs[2] = ($xattr & 0x01) ? '-' : 'w';
+                    $attribs[5] = ($xattr & 0x02) ? 'h' : '-';
+                    $attribs[6] = ($xattr & 0x04) ? 's' : '-';
+                    $attribs[4] = ($xattr & 0x20) ? 'a' : '-';
+                    if ($xattr & 0x10) {
+                        $attribs[0] = 'd';
+                        $attribs[3] = 'x';
+                    } else
+                        $attribs[0] = '-';
+                    if ($xattr & 0x08)
+                        $attribs[0] = 'V';
+                    else {
+                        $ext = strtolower(pathinfo($entry->getName(), PATHINFO_EXTENSION));
+                        if (in_array($ext, ["com", "exe", "btm", "cmd", "bat"])) {
+                            $attribs[3] = 'x';
+                        }
+                    }
+                    break;
+                } /* else: fall through! */
+
+            default: /* assume Unix-like */
+                switch ($xattr & self::UNX_IFMT) {
+                    case self::UNX_IFDIR:
+                        $attribs[0] = 'd';
+                        break;
+                    case self::UNX_IFREG:
+                        $attribs[0] = '-';
+                        break;
+                    case self::UNX_IFLNK:
+                        $attribs[0] = 'l';
+                        break;
+                    case self::UNX_IFBLK:
+                        $attribs[0] = 'b';
+                        break;
+                    case self::UNX_IFCHR:
+                        $attribs[0] = 'c';
+                        break;
+                    case self::UNX_IFIFO:
+                        $attribs[0] = 'p';
+                        break;
+                    case self::UNX_IFSOCK:
+                        $attribs[0] = 's';
+                        break;
+                    default:
+                        $attribs[0] = '?';
+                        break;
+                }
+                $attribs[1] = ($xattr & self::UNX_IRUSR) ? 'r' : '-';
+                $attribs[4] = ($xattr & self::UNX_IRGRP) ? 'r' : '-';
+                $attribs[7] = ($xattr & self::UNX_IROTH) ? 'r' : '-';
+                $attribs[2] = ($xattr & self::UNX_IWUSR) ? 'w' : '-';
+                $attribs[5] = ($xattr & self::UNX_IWGRP) ? 'w' : '-';
+                $attribs[8] = ($xattr & self::UNX_IWOTH) ? 'w' : '-';
+
+                if ($xattr & self::UNX_IXUSR)
+                    $attribs[3] = ($xattr & self::UNX_ISUID) ? 's' : 'x';
+                else
+                    $attribs[3] = ($xattr & self::UNX_ISUID) ? 'S' : '-';  /* S==undefined */
+                if ($xattr & self::UNX_IXGRP)
+                    $attribs[6] = ($xattr & self::UNX_ISGID) ? 's' : 'x';  /* == UNX_ENFMT */
+                else
+                    $attribs[6] = ($xattr & self::UNX_ISGID) ? 'S' : '-';  /* SunOS 4.1.x */
+                if ($xattr & self::UNX_IXOTH)
+                    $attribs[9] = ($xattr & self::UNX_ISVTX) ? 't' : 'x';  /* "sticky bit" */
+                else
+                    $attribs[9] = ($xattr & self::UNX_ISVTX) ? 'T' : '-';  /* T==undefined */
+        }
+        $this->attributes = trim($attribs);
     }
 
     /**
@@ -245,6 +357,7 @@ class ZipInfo
             'modified' => $this->getMtime(),
             'created' => $this->getCtime(),
             'accessed' => $this->getAtime(),
+            'attributes' => $this->getAttributes(),
             'encrypted' => $this->isEncrypted(),
             'comment' => $this->getComment(),
             'crc' => $this->getCrc(),
@@ -358,6 +471,14 @@ class ZipInfo
         return $this->version;
     }
 
+    /**
+     * @return string
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
     /**
      * @return string
      */
@@ -375,6 +496,7 @@ class ZipInfo
         . (!empty($this->comment) ? 'Comment="' . $this->getComment() . '", ' : '')
         . (!empty($this->crc) ? 'Crc=0x' . dechex($this->getCrc()) . ', ' : '')
         . 'Method="' . $this->getMethod() . '", '
+        . 'Attributes="' . $this->getAttributes() . '", '
         . 'Platform="' . $this->getPlatform() . '", '
         . 'Version=' . $this->getVersion()
         . '}';

src/PhpZip/ZipFile.php

@@ -401,7 +401,7 @@ class ZipFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
      */
     public static function openFromString($data)
     {
-        if (empty($data)) {
+        if (null === $data || strlen($data) === 0) {
             throw new IllegalArgumentException("Data not available");
         }
         if (!($handle = fopen('php://temp', 'r+b'))) {

src/PhpZip/ZipOutputFile.php

@@ -152,6 +152,16 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
         return new self($zipFile);
     }
 
+    /**
+     * Count zip entries.
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return sizeof($this->entries);
+    }
+
     /**
      * Returns the list files.
      *
@@ -269,7 +279,7 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
      */
     public function setComment($comment)
     {
-        if (null !== $comment && !empty($comment)) {
+        if (null !== $comment && strlen($comment) !== 0) {
             $comment = (string)$comment;
             $length = strlen($comment);
             if (0x0000 > $length || $length > 0xffff) {
@@ -292,17 +302,20 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
     public function addFromString($entryName, $data, $compressionMethod = ZipEntry::METHOD_DEFLATED)
     {
         $entryName = (string)$entryName;
-        if ($data === null) {
-            throw new IllegalArgumentException("data is null");
+        if ($data === null || strlen($data) === 0) {
+            throw new IllegalArgumentException("Data is empty");
         }
-        if (empty($entryName)) {
+        if ($entryName === null || strlen($entryName) === 0) {
             throw new IllegalArgumentException("Incorrect entry name " . $entryName);
         }
         $this->validateCompressionMethod($compressionMethod);
 
+        $externalAttributes = 0100644 << 16;
+
         $entry = new ZipEntry($entryName);
         $entry->setMethod($compressionMethod);
         $entry->setTime(time());
+        $entry->setExternalAttributes($externalAttributes);
 
         $this->entries[$entryName] = new ZipOutputStringEntry($data, $entry);
     }
@@ -343,7 +356,7 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
     )
     {
         $inputDir = (string)$inputDir;
-        if (empty($inputDir)) {
+        if ($inputDir === null || strlen($inputDir) === 0) {
             throw new IllegalArgumentException('Input dir empty');
         }
         if (!is_dir($inputDir)) {
@@ -367,22 +380,15 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
         foreach ($files as $file) {
             $filename = str_replace($inputDir, $moveToPath, $file);
             $filename = ltrim($filename, '/');
-            is_dir($file) && FilesUtil::isEmptyDir($file) && $this->addEmptyDir($filename);
-            is_file($file) && $this->addFromFile($file, $filename, $compressionMethod);
+            if (is_dir($file)) {
+                FilesUtil::isEmptyDir($file) && $this->addEmptyDir($filename);
+            } elseif (is_file($file)) {
+                $this->addFromFile($file, $filename, $compressionMethod);
+            }
         }
         return $this->count() > $count;
     }
 
-    /**
-     * Count zip entries.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return sizeof($this->entries);
-    }
-
     /**
      * Add an empty directory in the zip archive.
      *
@@ -392,17 +398,20 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
     public function addEmptyDir($dirName)
     {
         $dirName = (string)$dirName;
-        if (empty($dirName)) {
+        if (strlen($dirName) === 0) {
             throw new IllegalArgumentException("dirName null or not string");
         }
         $dirName = rtrim($dirName, '/') . '/';
         if (!isset($this->entries[$dirName])) {
+            $externalAttributes = 040755 << 16;
+
             $entry = new ZipEntry($dirName);
             $entry->setTime(time());
             $entry->setMethod(ZipEntry::METHOD_STORED);
             $entry->setSize(0);
             $entry->setCompressedSize(0);
             $entry->setCrc(0);
+            $entry->setExternalAttributes($externalAttributes);
 
             $this->entries[$dirName] = new ZipOutputEmptyDirEntry($entry);
         }
@@ -447,14 +456,19 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
             throw new IllegalArgumentException("stream is not resource");
         }
         $entryName = (string)$entryName;
-        if (empty($entryName)) {
+        if (strlen($entryName) === 0) {
             throw new IllegalArgumentException("Incorrect entry name " . $entryName);
         }
         $this->validateCompressionMethod($compressionMethod);
 
+        $fstat = fstat($stream);
+        $mode = sprintf('%o', $fstat['mode']);
+        $externalAttributes = (octdec($mode) & 0xffff) << 16;
+
         $entry = new ZipEntry($entryName);
         $entry->setMethod($compressionMethod);
         $entry->setTime(time());
+        $entry->setExternalAttributes($externalAttributes);
 
         $this->entries[$entryName] = new ZipOutputStreamEntry($stream, $entry);
     }
@@ -486,7 +500,7 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
         if (!is_dir($inputDir)) {
             throw new IllegalArgumentException('Directory ' . $inputDir . ' can\'t exists');
         }
-        if (null === $globPattern || !is_string($globPattern)) {
+        if (null === $globPattern || strlen($globPattern) === 0) {
             throw new IllegalArgumentException("globPattern null");
         }
         if (empty($globPattern)) {
@@ -514,8 +528,11 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
         foreach ($filesFound as $file) {
             $filename = str_replace($inputDir, $moveToPath, $file);
             $filename = ltrim($filename, '/');
-            is_dir($file) && FilesUtil::isEmptyDir($file) && $this->addEmptyDir($filename);
-            is_file($file) && $this->addFromFile($file, $filename, $compressionMethod);
+            if (is_dir($file)) {
+                FilesUtil::isEmptyDir($file) && $this->addEmptyDir($filename);
+            } elseif (is_file($file)) {
+                $this->addFromFile($file, $filename, $compressionMethod);
+            }
         }
         return $this->count() > $count;
     }
@@ -571,8 +588,11 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
         foreach ($files as $file) {
             $filename = str_replace($inputDir, $moveToPath, $file);
             $filename = ltrim($filename, '/');
-            is_dir($file) && FilesUtil::isEmptyDir($file) && $this->addEmptyDir($filename);
-            is_file($file) && $this->addFromFile($file, $filename, $compressionMethod);
+            if (is_dir($file)) {
+                FilesUtil::isEmptyDir($file) && $this->addEmptyDir($filename);
+            } elseif (is_file($file)) {
+                $this->addFromFile($file, $filename, $compressionMethod);
+            }
         }
         return $this->count() > $count;
     }
@@ -894,7 +914,7 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
         }
 
         if (ZipEntry::UNKNOWN === $entry->getPlatform()) {
-            $entry->setRawPlatform(ZipEntry::getCurrentPlatform());
+            $entry->setRawPlatform(ZipEntry::PLATFORM_UNIX);
         }
         if (ZipEntry::UNKNOWN === $entry->getTime()) {
             $entry->setTime(time());
@@ -1268,7 +1288,7 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
     public function outputAsAttachment($outputFilename, $mimeType = null)
     {
         $outputFilename = (string)$outputFilename;
-        if (empty($outputFilename)) {
+        if (strlen($outputFilename) === 0) {
             throw new IllegalArgumentException("Output filename is empty.");
         }
         if (empty($mimeType) || !is_string($mimeType)) {
@@ -1360,7 +1380,8 @@ class ZipOutputFile implements \Countable, \ArrayAccess, \Iterator, ZipConstants
      */
     public function offsetSet($entryName, $uncompressedDataContent)
     {
-        if (empty($entryName)) {
+        $entryName = (string)$entryName;
+        if (strlen($entryName) === 0) {
             throw new IllegalArgumentException('Entry name empty');
         }
         if ($entryName[strlen($entryName) - 1] === '/') {