Ne-Lexa / php-zip

src/PhpZip/Crypto/WinZipAesEngine.php

Spacing +1 added lines, -2 removed lines

@@ -174,8 +174,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;

src/PhpZip/Crypto/TraditionalPkwareEncryptionEngine.php

Spacing +1 added lines, -2 removed lines

@@ -427,8 +427,7 @@
         }
 
         $crc = $this->entry->isDataDescriptorRequired() ?
-            ($this->entry->getDosTime() & 0x0000ffff) << 16 :
-            $this->entry->getCrc();
+            ($this->entry->getDosTime() & 0x0000ffff) << 16 : $this->entry->getCrc();
 
         try {
             $headerBytes = random_bytes(self::STD_DEC_HDR_SIZE);

src/PhpZip/ZipFile.php

Spacing +25 added lines, -26 removed lines

@@ -336,7 +336,7 @@ 
 
         if (!empty($entries)) {
             if (\is_string($entries)) {
-                $entries = (array) $entries;
+                $entries = (array)$entries;
             }
 
             if (\is_array($entries)) {
@@ -344,7 +344,7 @@ 
                 $flipEntries = array_flip($entries);
                 $zipEntries = array_filter(
                     $zipEntries,
-                    static function (ZipEntry $zipEntry) use ($flipEntries) {
+                    static function(ZipEntry $zipEntry) use ($flipEntries) {
                         return isset($flipEntries[$zipEntry->getName()]);
                     }
                 );
@@ -411,12 +411,12 @@ 
         if ($localName === null) {
             throw new InvalidArgumentException('Entry name is null');
         }
-        $localName = ltrim((string) $localName, '\\/');
+        $localName = ltrim((string)$localName, '\\/');
 
         if ($localName === '') {
             throw new InvalidArgumentException('Empty entry name');
         }
-        $contents = (string) $contents;
+        $contents = (string)$contents;
         $length = \strlen($contents);
 
         if ($compressionMethod === null) {
@@ -487,7 +487,7 @@ 
         if ($localName === null) {
             $localName = basename($filename);
         }
-        $localName = ltrim((string) $localName, '\\/');
+        $localName = ltrim((string)$localName, '\\/');
 
         if ($localName === '') {
             throw new InvalidArgumentException('Empty entry name');
@@ -533,7 +533,7 @@ 
         if ($localName === null) {
             throw new InvalidArgumentException('Entry name is null');
         }
-        $localName = ltrim((string) $localName, '\\/');
+        $localName = ltrim((string)$localName, '\\/');
 
         if ($localName === '') {
             throw new InvalidArgumentException('Empty entry name');
@@ -586,7 +586,7 @@ 
         if ($dirName === null) {
             throw new InvalidArgumentException('Dir name is null');
         }
-        $dirName = ltrim((string) $dirName, '\\/');
+        $dirName = ltrim((string)$dirName, '\\/');
 
         if ($dirName === '') {
             throw new InvalidArgumentException('Empty dir name');
@@ -626,7 +626,7 @@ 
         if ($inputDir === null) {
             throw new InvalidArgumentException('Input dir is null');
         }
-        $inputDir = (string) $inputDir;
+        $inputDir = (string)$inputDir;
 
         if ($inputDir === '') {
             throw new InvalidArgumentException('The input directory is not specified');
@@ -664,7 +664,7 @@ 
         if ($inputDir === null) {
             throw new InvalidArgumentException('Input dir is null');
         }
-        $inputDir = (string) $inputDir;
+        $inputDir = (string)$inputDir;
 
         if ($inputDir === '') {
             throw new InvalidArgumentException('The input directory is not specified');
@@ -702,7 +702,7 @@ 
         $localPath = '/',
         $compressionMethod = null
     ) {
-        $localPath = (string) $localPath;
+        $localPath = (string)$localPath;
 
         if ($localPath !== '') {
             $localPath = trim($localPath, '\\/');
@@ -711,8 +711,7 @@ 
         }
 
         $iterator = $iterator instanceof \RecursiveIterator ?
-            new \RecursiveIteratorIterator($iterator) :
-            new \IteratorIterator($iterator);
+            new \RecursiveIteratorIterator($iterator) : new \IteratorIterator($iterator);
         /**
          * @var string[] $files
          * @var string   $path
@@ -791,7 +790,7 @@ 
         if ($inputDir === null) {
             throw new InvalidArgumentException('Input dir is null');
         }
-        $inputDir = (string) $inputDir;
+        $inputDir = (string)$inputDir;
 
         if ($inputDir === '') {
             throw new InvalidArgumentException('The input directory is not specified');
@@ -800,7 +799,7 @@ 
         if (!is_dir($inputDir)) {
             throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir));
         }
-        $globPattern = (string) $globPattern;
+        $globPattern = (string)$globPattern;
 
         if (empty($globPattern)) {
             throw new InvalidArgumentException('The glob pattern is not specified');
@@ -883,12 +882,12 @@ 
         $recursive = true,
         $compressionMethod = null
     ) {
-        $regexPattern = (string) $regexPattern;
+        $regexPattern = (string)$regexPattern;
 
         if (empty($regexPattern)) {
             throw new InvalidArgumentException('The regex pattern is not specified');
         }
-        $inputDir = (string) $inputDir;
+        $inputDir = (string)$inputDir;
 
         if ($inputDir === '') {
             throw new InvalidArgumentException('The input directory is not specified');
@@ -993,8 +992,8 @@ 
         if ($oldName === null || $newName === null) {
             throw new InvalidArgumentException('name is null');
         }
-        $oldName = ltrim((string) $oldName, '\\/');
-        $newName = ltrim((string) $newName, '\\/');
+        $oldName = ltrim((string)$oldName, '\\/');
+        $newName = ltrim((string)$newName, '\\/');
 
         if ($oldName !== $newName) {
             $this->zipModel->renameEntry($oldName, $newName);
@@ -1014,7 +1013,7 @@ 
      */
     public function deleteFromName($entryName)
     {
-        $entryName = ltrim((string) $entryName, '\\/');
+        $entryName = ltrim((string)$entryName, '\\/');
 
         if (!$this->zipModel->deleteEntry($entryName)) {
             throw new ZipEntryNotFoundException($entryName);
@@ -1094,7 +1093,7 @@ 
             );
         }
         $this->matcher()->all()->invoke(
-            function ($entry) use ($compressionLevel) {
+            function($entry) use ($compressionLevel) {
                 $this->setCompressionLevelEntry($entry, $compressionLevel);
             }
         );
@@ -1380,7 +1379,7 @@ 
      */
     public function saveAsFile($filename)
     {
-        $filename = (string) $filename;
+        $filename = (string)$filename;
 
         $tempFilename = $filename . '.temp' . uniqid('', true);
 
@@ -1435,7 +1434,7 @@ 
      */
     public function outputAsAttachment($outputFilename, $mimeType = null, $attachment = true)
     {
-        $outputFilename = (string) $outputFilename;
+        $outputFilename = (string)$outputFilename;
 
         if ($mimeType === null) {
             $mimeType = $this->getMimeTypeByFilename($outputFilename);
@@ -1475,7 +1474,7 @@ 
      */
     protected function getMimeTypeByFilename($outputFilename)
     {
-        $outputFilename = (string) $outputFilename;
+        $outputFilename = (string)$outputFilename;
         $ext = strtolower(pathinfo($outputFilename, \PATHINFO_EXTENSION));
 
         if (!empty($ext) && isset(self::$defaultMimeTypes[$ext])) {
@@ -1499,7 +1498,7 @@ 
      */
     public function outputAsResponse(ResponseInterface $response, $outputFilename, $mimeType = null, $attachment = true)
     {
-        $outputFilename = (string) $outputFilename;
+        $outputFilename = (string)$outputFilename;
 
         if ($mimeType === null) {
             $mimeType = $this->getMimeTypeByFilename($outputFilename);
@@ -1646,7 +1645,7 @@ 
         if ($entryName === null) {
             throw new InvalidArgumentException('entryName is null');
         }
-        $entryName = ltrim((string) $entryName, '\\/');
+        $entryName = ltrim((string)$entryName, '\\/');
 
         if ($entryName === '') {
             throw new InvalidArgumentException('entryName is empty');
@@ -1668,7 +1667,7 @@ 
         } elseif (\is_resource($contents)) {
             $this->addFromStream($contents, $entryName);
         } else {
-            $this->addFromString($entryName, (string) $contents);
+            $this->addFromString($entryName, (string)$contents);
         }
     }
 

src/PhpZip/Stream/ResponseStream.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
         }
         $this->rewind();
 
-        return (string) stream_get_contents($this->stream);
+        return (string)stream_get_contents($this->stream);
     }
 
     /**

src/PhpZip/Stream/ZipOutputStream.php

Spacing +2 added lines, -3 removed lines

@@ -278,8 +278,7 @@ 
 
                     case ZipFile::METHOD_BZIP2:
                         $compressionLevel = $entry->getCompressionLevel() === ZipFile::LEVEL_DEFAULT_COMPRESSION ?
-                            ZipEntry::LEVEL_DEFAULT_BZIP2_COMPRESSION :
-                            $entry->getCompressionLevel();
+                            ZipEntry::LEVEL_DEFAULT_BZIP2_COMPRESSION : $entry->getCompressionLevel();
                         /** @noinspection PhpComposerExtensionStubsInspection */
                         $entryContent = bzcompress($entryContent, $compressionLevel);
 
@@ -488,7 +487,7 @@ 
             // find max software version, version needed to extract and most common platform
             list($softwareVersion, $versionNeededToExtract) = array_reduce(
                 $this->zipModel->getEntries(),
-                static function (array $carry, ZipEntry $entry) {
+                static function(array $carry, ZipEntry $entry) {
                     $carry[0] = max($carry[0], $entry->getSoftwareVersion() & 0xFF);
                     $carry[1] = max($carry[1], $entry->getVersionNeededToExtract() & 0xFF);
 

src/PhpZip/Model/ZipEntryMatcher.php

Spacing +10 added lines, -10 removed lines

@@ -31,10 +31,10 @@ 
      */
     public function add($entries)
     {
-        $entries = (array) $entries;
+        $entries = (array)$entries;
         $entries = array_map(
-            static function ($entry) {
-                return $entry instanceof ZipEntry ? $entry->getName() : (string) $entry;
+            static function($entry) {
+                return $entry instanceof ZipEntry ? $entry->getName() : (string)$entry;
             },
             $entries
         );
@@ -67,13 +67,13 @@ 
     {
         array_walk(
             $this->zipModel->getEntries(),
-            function (
+            function(
                 /** @noinspection PhpUnusedParameterInspection */
                 $entry,
                 $entryName
             ) use ($regexp) {
                 if (preg_match($regexp, $entryName)) {
-                    $this->matches[] = (string) $entryName;
+                    $this->matches[] = (string)$entryName;
                 }
             }
         );
@@ -105,7 +105,7 @@ 
         if (!empty($this->matches)) {
             array_walk(
                 $this->matches,
-                static function ($entryName) use ($callable) {
+                static function($entryName) use ($callable) {
                     $callable($entryName);
                 }
             );
@@ -124,7 +124,7 @@ 
     {
         array_walk(
             $this->matches,
-            function ($entry) {
+            function($entry) {
                 $this->zipModel->deleteEntry($entry);
             }
         );
@@ -139,7 +139,7 @@ 
     {
         array_walk(
             $this->matches,
-            function ($entry) use ($password, $encryptionMethod) {
+            function($entry) use ($password, $encryptionMethod) {
                 $entry = $this->zipModel->getEntry($entry);
 
                 if (!$entry->isDirectory()) {
@@ -156,7 +156,7 @@ 
     {
         array_walk(
             $this->matches,
-            function ($entry) use ($encryptionMethod) {
+            function($entry) use ($encryptionMethod) {
                 $entry = $this->zipModel->getEntry($entry);
 
                 if (!$entry->isDirectory()) {
@@ -170,7 +170,7 @@ 
     {
         array_walk(
             $this->matches,
-            function ($entry) {
+            function($entry) {
                 $entry = $this->zipModel->getEntry($entry);
 
                 if (!$entry->isDirectory()) {

src/PhpZip/Model/ZipModel.php

Spacing +8 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
     public function setArchiveComment($comment)
     {
         if ($comment !== null && $comment !== '') {
-            $comment = (string) $comment;
+            $comment = (string)$comment;
             $length = \strlen($comment);
 
             if ($length > 0xffff) {
@@ -136,7 +136,7 @@ 
      */
     public function setZipAlign($zipAlign)
     {
-        $this->zipAlign = $zipAlign === null ? null : (int) $zipAlign;
+        $this->zipAlign = $zipAlign === null ? null : (int)$zipAlign;
     }
 
     /**
@@ -187,8 +187,8 @@ 
      */
     public function renameEntry($old, $new)
     {
-        $old = $old instanceof ZipEntry ? $old->getName() : (string) $old;
-        $new = $new instanceof ZipEntry ? $new->getName() : (string) $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.');
@@ -229,7 +229,7 @@ 
      */
     public function getEntry($entryName)
     {
-        $entryName = $entryName instanceof ZipEntry ? $entryName->getName() : (string) $entryName;
+        $entryName = $entryName instanceof ZipEntry ? $entryName->getName() : (string)$entryName;
 
         if (isset($this->outEntries[$entryName])) {
             return $this->outEntries[$entryName];
@@ -245,7 +245,7 @@ 
      */
     public function deleteEntry($entry)
     {
-        $entry = $entry instanceof ZipEntry ? $entry->getName() : (string) $entry;
+        $entry = $entry instanceof ZipEntry ? $entry->getName() : (string)$entry;
 
         if (isset($this->outEntries[$entry])) {
             unset($this->outEntries[$entry]);
@@ -281,7 +281,7 @@ 
      */
     public function hasEntry($entryName)
     {
-        $entryName = $entryName instanceof ZipEntry ? $entryName->getName() : (string) $entryName;
+        $entryName = $entryName instanceof ZipEntry ? $entryName->getName() : (string)$entryName;
 
         return isset($this->outEntries[$entryName]);
     }
@@ -338,7 +338,7 @@ 
      */
     public function unchangeEntry($entry)
     {
-        $entry = $entry instanceof ZipEntry ? $entry->getName() : (string) $entry;
+        $entry = $entry instanceof ZipEntry ? $entry->getName() : (string)$entry;
 
         if (isset($this->outEntries[$entry], $this->inputEntries[$entry])) {
             $this->outEntries[$entry] = $this->inputEntries[$entry];

src/PhpZip/Model/ZipInfo.php

Spacing +24 added lines, -24 removed lines

@@ -59,53 +59,53 @@
 
     const MADE_BY_UNKNOWN = 20;
 
-    const UNX_IFMT = 0170000;    // Unix file type mask
+    const UNX_IFMT = 0170000; // Unix file type mask
 
-    const UNX_IFREG = 0100000;    // Unix regular file
+    const UNX_IFREG = 0100000; // Unix regular file
 
-    const UNX_IFSOCK = 0140000;     // Unix socket (BSD, not SysV or Amiga)
+    const UNX_IFSOCK = 0140000; // Unix socket (BSD, not SysV or Amiga)
 
-    const UNX_IFLNK = 0120000;    // Unix symbolic link (not SysV, Amiga)
+    const UNX_IFLNK = 0120000; // Unix symbolic link (not SysV, Amiga)
 
-    const UNX_IFBLK = 0060000;    // Unix block special       (not Amiga)
+    const UNX_IFBLK = 0060000; // Unix block special       (not Amiga)
 
-    const UNX_IFDIR = 0040000;    // Unix directory
+    const UNX_IFDIR = 0040000; // Unix directory
 
-    const UNX_IFCHR = 0020000;    // Unix character special   (not Amiga)
+    const UNX_IFCHR = 0020000; // Unix character special   (not Amiga)
 
-    const UNX_IFIFO = 0010000;    // Unix fifo    (BCC, not MSC or Amiga)
+    const UNX_IFIFO = 0010000; // Unix fifo    (BCC, not MSC or Amiga)
 
-    const UNX_ISUID = 04000;      // Unix set user id on execution
+    const UNX_ISUID = 04000; // Unix set user id on execution
 
-    const UNX_ISGID = 02000;      // Unix set group id on execution
+    const UNX_ISGID = 02000; // Unix set group id on execution
 
-    const UNX_ISVTX = 01000;      // Unix directory permissions control
+    const UNX_ISVTX = 01000; // Unix directory permissions control
 
-    const UNX_ENFMT = self::UNX_ISGID;  // Unix record locking enforcement flag
+    const UNX_ENFMT = self::UNX_ISGID; // Unix record locking enforcement flag
 
-    const UNX_IRWXU = 00700;      // Unix read, write, execute: owner
+    const UNX_IRWXU = 00700; // Unix read, write, execute: owner
 
-    const UNX_IRUSR = 00400;      // Unix read permission: owner
+    const UNX_IRUSR = 00400; // Unix read permission: owner
 
-    const UNX_IWUSR = 00200;      // Unix write permission: owner
+    const UNX_IWUSR = 00200; // Unix write permission: owner
 
-    const UNX_IXUSR = 00100;      // Unix execute permission: owner
+    const UNX_IXUSR = 00100; // Unix execute permission: owner
 
-    const UNX_IRWXG = 00070;      // Unix read, write, execute: group
+    const UNX_IRWXG = 00070; // Unix read, write, execute: group
 
-    const UNX_IRGRP = 00040;      // Unix read permission: group
+    const UNX_IRGRP = 00040; // Unix read permission: group
 
-    const UNX_IWGRP = 00020;      // Unix write permission: group
+    const UNX_IWGRP = 00020; // Unix write permission: group
 
-    const UNX_IXGRP = 00010;      // Unix execute permission: group
+    const UNX_IXGRP = 00010; // Unix execute permission: group
 
-    const UNX_IRWXO = 00007;      // Unix read, write, execute: other
+    const UNX_IRWXO = 00007; // Unix read, write, execute: other
 
-    const UNX_IROTH = 00004;      // Unix read permission: other
+    const UNX_IROTH = 00004; // Unix read permission: other
 
-    const UNX_IWOTH = 00002;      // Unix write permission: other
+    const UNX_IWOTH = 00002; // Unix write permission: other
 
-    const UNX_IXOTH = 00001;      // Unix execute permission: other
+    const UNX_IXOTH = 00001; // Unix execute permission: other
 
     private static $platformNames = [
         self::MADE_BY_MS_DOS => 'FAT',

src/PhpZip/Model/Entry/ZipAbstractEntry.php

Spacing +8 added lines, -8 removed lines

@@ -232,7 +232,7 @@ 
      */
     public function setCreatedOS($platform)
     {
-        $platform = (int) $platform;
+        $platform = (int)$platform;
 
         if ($platform < 0x00 || $platform > 0xff) {
             throw new ZipException('Platform out of range');
@@ -261,7 +261,7 @@ 
      */
     public function setExtractedOS($platform)
     {
-        $platform = (int) $platform;
+        $platform = (int)$platform;
 
         if ($platform < 0x00 || $platform > 0xff) {
             throw new ZipException('Platform out of range');
@@ -286,7 +286,7 @@ 
      */
     public function setSoftwareVersion($softwareVersion)
     {
-        $this->softwareVersion = (int) $softwareVersion;
+        $this->softwareVersion = (int)$softwareVersion;
 
         return $this;
     }
@@ -407,7 +407,7 @@ 
      */
     public function setOffset($offset)
     {
-        $this->offset = (int) $offset;
+        $this->offset = (int)$offset;
 
         return $this;
     }
@@ -516,7 +516,7 @@ 
      */
     public function setEncrypted($encrypted)
     {
-        $encrypted = (bool) $encrypted;
+        $encrypted = (bool)$encrypted;
         $this->setGeneralPurposeBitFlag(self::GPBF_ENCRYPTED, $encrypted);
 
         return $this;
@@ -602,7 +602,7 @@ 
      */
     public function setDosTime($dosTime)
     {
-        $dosTime = (int) $dosTime;
+        $dosTime = (int)$dosTime;
 
         if ($dosTime < 0x00000000 || $dosTime > 0xffffffff) {
             throw new ZipException('DosTime out of range');
@@ -667,7 +667,7 @@ 
      */
     public function setInternalAttributes($attributes)
     {
-        $this->internalAttributes = (int) $attributes;
+        $this->internalAttributes = (int)$attributes;
 
         return $this;
     }
@@ -795,7 +795,7 @@ 
      */
     public function setCrc($crc)
     {
-        $this->crc = (int) $crc;
+        $this->crc = (int)$crc;
 
         return $this;
     }