Ne-Lexa / php-zip

src/PhpZip/Crypto/TraditionalPkwareEncryptionEngine.php

Spacing +1 added lines, -2 removed lines

@@ -184,8 +184,7 @@
     public function encrypt($data)
     {
         $crc = $this->entry->isDataDescriptorRequired() ?
-            ($this->entry->getDosTime() & 0x0000ffff) << 16 :
-            $this->entry->getCrc();
+            ($this->entry->getDosTime() & 0x0000ffff) << 16 : $this->entry->getCrc();
         $headerBytes = CryptoUtil::randomBytes(self::STD_DEC_HDR_SIZE);
 
         // Initialize again since the generated bytes were encrypted.

src/PhpZip/Crypto/WinZipAesEngine.php

Spacing +2 added lines, -3 removed lines

@@ -161,8 +161,7 @@ 
             }
             $data = substr($str, $i * 16, 16);
             $ctrStr .= $encrypted ?
-                self::encryptCtr($data, $key, $iv) :
-                self::decryptCtr($data, $key, $iv);
+                self::encryptCtr($data, $key, $iv) : self::decryptCtr($data, $key, $iv);
         }
         return $ctrStr;
     }
@@ -225,7 +224,7 @@ 
         // Init key strength.
         $password = $this->entry->getPassword();
         if ($password === null) {
-            throw new ZipException('No password was set for the entry "'.$this->entry->getName().'"');
+            throw new ZipException('No password was set for the entry "' . $this->entry->getName() . '"');
         }
 
         // WinZip 99-character limit

src/PhpZip/Stream/ZipInputStream.php

Spacing +1 added lines, -1 removed lines

@@ -384,7 +384,7 @@
         $pos = $entry->getOffset();
         $pos = PHP_INT_SIZE === 4
             ? sprintf('%u', $pos) // PHP 32-Bit
-            : $pos;                      // PHP 64-Bit
+            : $pos; // PHP 64-Bit
 
         $startPos = $pos = $this->mapper->map($pos);
         fseek($this->in, $startPos);

src/PhpZip/Stream/ZipOutputStream.php

Spacing +1 added lines, -2 removed lines

@@ -253,8 +253,7 @@
 
                     case ZipFileInterface::METHOD_BZIP2:
                         $compressionLevel = $entry->getCompressionLevel() === ZipFileInterface::LEVEL_DEFAULT_COMPRESSION ?
-                            ZipEntry::LEVEL_DEFAULT_BZIP2_COMPRESSION :
-                            $entry->getCompressionLevel();
+                            ZipEntry::LEVEL_DEFAULT_BZIP2_COMPRESSION : $entry->getCompressionLevel();
                         /** @noinspection PhpComposerExtensionStubsInspection */
                         $entryContent = bzcompress($entryContent, $compressionLevel);
                         if (is_int($entryContent)) {

src/PhpZip/Model/Entry/ZipNewEntry.php

Spacing +3 added lines, -6 removed lines

@@ -57,12 +57,9 @@
     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)
+        return self::METHOD_WINZIP_AES === $method ? 51 : (
+            ZipFileInterface::METHOD_BZIP2 === $method ? 46 : (
+                $this->isZip64ExtensionsRequired() ? 45 : (ZipFileInterface::METHOD_DEFLATED === $method || $this->isDirectory() ? 20 : 10)
                 )
             );
     }

src/PhpZip/Model/Entry/ZipAbstractEntry.php

Spacing +1 added lines, -2 removed lines

@@ -430,8 +430,7 @@
     {
         $isInit = $this->isInit(self::BIT_METHOD);
         return $isInit ?
-            $this->method & 0xffff :
-            self::UNKNOWN;
+            $this->method & 0xffff : self::UNKNOWN;
     }
 
     /**

src/PhpZip/Model/ZipInfo.php

Spacing +27 added lines, -30 removed lines

@@ -38,30 +38,30 @@ 
     const MADE_BY_OS_X = 19;
     const MADE_BY_UNKNOWN = 20;
 
-    const UNX_IFMT = 0170000;    /* Unix file type mask */
-    const UNX_IFREG = 0100000;    /* Unix regular file */
-    const UNX_IFSOCK = 0140000;     /* Unix socket (BSD, not SysV or Amiga) */
-    const UNX_IFLNK = 0120000;    /* Unix symbolic link (not SysV, Amiga) */
-    const UNX_IFBLK = 0060000;    /* Unix block special       (not Amiga) */
-    const UNX_IFDIR = 0040000;    /* Unix directory */
-    const UNX_IFCHR = 0020000;    /* Unix character special   (not Amiga) */
-    const UNX_IFIFO = 0010000;    /* Unix fifo    (BCC, not MSC or Amiga) */
-    const UNX_ISUID = 04000;      /* Unix set user id on execution */
-    const UNX_ISGID = 02000;      /* Unix set group id on execution */
-    const UNX_ISVTX = 01000;      /* Unix directory permissions control */
-    const UNX_ENFMT = self::UNX_ISGID;  /* Unix record locking enforcement flag */
-    const UNX_IRWXU = 00700;      /* Unix read, write, execute: owner */
-    const UNX_IRUSR = 00400;      /* Unix read permission: owner */
-    const UNX_IWUSR = 00200;      /* Unix write permission: owner */
-    const UNX_IXUSR = 00100;      /* Unix execute permission: owner */
-    const UNX_IRWXG = 00070;      /* Unix read, write, execute: group */
-    const UNX_IRGRP = 00040;      /* Unix read permission: group */
-    const UNX_IWGRP = 00020;      /* Unix write permission: group */
-    const UNX_IXGRP = 00010;      /* Unix execute permission: group */
-    const UNX_IRWXO = 00007;      /* Unix read, write, execute: other */
-    const UNX_IROTH = 00004;      /* Unix read permission: other */
-    const UNX_IWOTH = 00002;      /* Unix write permission: other */
-    const UNX_IXOTH = 00001;      /* Unix execute permission: other */
+    const UNX_IFMT = 0170000; /* Unix file type mask */
+    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',
@@ -207,11 +207,9 @@ 
         $this->name = $entry->getName();
         $this->folder = $entry->isDirectory();
         $this->size = PHP_INT_SIZE === 4 ?
-            sprintf('%u', $entry->getSize()) :
-            $entry->getSize();
+            sprintf('%u', $entry->getSize()) : $entry->getSize();
         $this->compressedSize = PHP_INT_SIZE === 4 ?
-            sprintf('%u', $entry->getCompressedSize()) :
-            $entry->getCompressedSize();
+            sprintf('%u', $entry->getCompressedSize()) : $entry->getCompressedSize();
         $this->mtime = $mtime;
         $this->ctime = $ctime;
         $this->atime = $atime;
@@ -228,8 +226,7 @@ 
         $attributes = str_repeat(" ", 12);
         $externalAttributes = $entry->getExternalAttributes();
         $externalAttributes = PHP_INT_SIZE === 4 ?
-            sprintf('%u', $externalAttributes) :
-            $externalAttributes;
+            sprintf('%u', $externalAttributes) : $externalAttributes;
         $xattr = (($externalAttributes >> 16) & 0xFFFF);
         switch ($entry->getPlatform()) {
             case self::MADE_BY_MS_DOS:

src/PhpZip/Model/ZipEntryMatcher.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
     public function add($entries)
     {
         $entries = (array)$entries;
-        $entries = array_map(function ($entry) {
+        $entries = array_map(function($entry) {
             return $entry instanceof ZipEntry ? $entry->getName() : $entry;
         }, $entries);
         $this->matches = array_unique(
@@ -57,7 +57,7 @@ 
      */
     public function match($regexp)
     {
-        array_walk($this->zipModel->getEntries(), function (
+        array_walk($this->zipModel->getEntries(), function(
             /** @noinspection PhpUnusedParameterInspection */
             $entry,
             $entryName
@@ -90,7 +90,7 @@ 
     public function invoke(callable $callable)
     {
         if (!empty($this->matches)) {
-            array_walk($this->matches, function ($entryName) use ($callable) {
+            array_walk($this->matches, function($entryName) use ($callable) {
                 call_user_func($callable, $entryName);
             });
         }
@@ -106,7 +106,7 @@ 
 
     public function delete()
     {
-        array_walk($this->matches, function ($entry) {
+        array_walk($this->matches, function($entry) {
             $this->zipModel->deleteEntry($entry);
         });
         $this->matches = [];
@@ -118,7 +118,7 @@ 
      */
     public function setPassword($password, $encryptionMethod = null)
     {
-        array_walk($this->matches, function ($entry) use ($password, $encryptionMethod) {
+        array_walk($this->matches, function($entry) use ($password, $encryptionMethod) {
             $entry = $this->zipModel->getEntry($entry);
             if (!$entry->isDirectory()) {
                 $this->zipModel->getEntryForChanges($entry)->setPassword($password, $encryptionMethod);
@@ -131,7 +131,7 @@ 
      */
     public function setEncryptionMethod($encryptionMethod)
     {
-        array_walk($this->matches, function ($entry) use ($encryptionMethod) {
+        array_walk($this->matches, function($entry) use ($encryptionMethod) {
             $entry = $this->zipModel->getEntry($entry);
             if (!$entry->isDirectory()) {
                 $this->zipModel->getEntryForChanges($entry)->setEncryptionMethod($encryptionMethod);
@@ -141,7 +141,7 @@ 
 
     public function disableEncryption()
     {
-        array_walk($this->matches, function ($entry) {
+        array_walk($this->matches, function($entry) {
             $entry = $this->zipModel->getEntry($entry);
             if (!$entry->isDirectory()) {
                 $entry = $this->zipModel->getEntryForChanges($entry);

src/PhpZip/Util/FilesUtil.php

Spacing +3 added lines, -6 removed lines

@@ -139,18 +139,15 @@
     public static function fileSearchWithIgnore($inputDir, $recursive = true, array $ignoreFiles = [])
     {
         $directoryIterator = $recursive ?
-            new \RecursiveDirectoryIterator($inputDir) :
-            new \DirectoryIterator($inputDir);
+            new \RecursiveDirectoryIterator($inputDir) : new \DirectoryIterator($inputDir);
 
         if (!empty($ignoreFiles)) {
             $directoryIterator = $recursive ?
-                new IgnoreFilesRecursiveFilterIterator($directoryIterator, $ignoreFiles) :
-                new IgnoreFilesFilterIterator($directoryIterator, $ignoreFiles);
+                new IgnoreFilesRecursiveFilterIterator($directoryIterator, $ignoreFiles) : new IgnoreFilesFilterIterator($directoryIterator, $ignoreFiles);
         }
 
         $iterator = $recursive ?
-            new \RecursiveIteratorIterator($directoryIterator) :
-            new \IteratorIterator($directoryIterator);
+            new \RecursiveIteratorIterator($directoryIterator) : new \IteratorIterator($directoryIterator);
 
         $fileList = [];
         foreach ($iterator as $file) {