Ne-Lexa / php-zip

src/IO/Filter/Cipher/WinZipAes/WinZipAesEncryptionStreamFilter.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
             return false;
         }
 
-        $this->size = (int) $this->params['size'];
+        $this->size = (int)$this->params['size'];
         $this->context = null;
         $this->buffer = '';
 

src/IO/Filter/Cipher/WinZipAes/WinZipAesContext.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function __construct($encryptionStrengthBits, $password, $salt)
     {
-        $encryptionStrengthBits = (int) $encryptionStrengthBits;
+        $encryptionStrengthBits = (int)$encryptionStrengthBits;
 
         if ($password === '') {
             throw new RuntimeException('$password is empty');
@@ -69,7 +69,7 @@ 
         $password = substr($password, 0, 99);
 
         $this->iv = str_repeat("\0", self::IV_SIZE);
-        $keyStrengthBytes = (int) ($encryptionStrengthBits / 8);
+        $keyStrengthBytes = (int)($encryptionStrengthBits / 8);
         $hashLength = $keyStrengthBytes * 2 + self::PASSWORD_VERIFIER_SIZE * 8;
 
         $hash = hash_pbkdf2(

src/IO/Filter/Cipher/Traditional/PKEncryptionStreamFilter.php

Spacing +2 added lines, -3 removed lines

@@ -61,14 +61,13 @@
             return false;
         }
 
-        $this->size = (int) $this->params['size'];
+        $this->size = (int)$this->params['size'];
 
         // init keys
         $this->context = new PKCryptContext($password);
 
         $crc = $entry->isDataDescriptorRequired() ?
-            ($entry->getDosTime() & 0x0000ffff) << 16 :
-            $entry->getCrc();
+            ($entry->getDosTime() & 0x0000ffff) << 16 : $entry->getCrc();
 
         try {
             $headerBytes = random_bytes(PKCryptContext::STD_DEC_HDR_SIZE);

src/IO/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/IO/Stream/ZipEntryStreamWrapper.php

Spacing +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
      */
     public function stream_truncate($new_size)
     {
-        return ftruncate($this->fp, (int) $new_size);
+        return ftruncate($this->fp, (int)$new_size);
     }
 
     /**

src/IO/ZipWriter.php

Spacing +4 added lines, -5 removed lines

@@ -266,10 +266,9 @@ 
      */
     protected function getExtraFieldsContents(ZipEntry $entry, $local)
     {
-        $local = (bool) $local;
+        $local = (bool)$local;
         $collection = $local ?
-            $entry->getLocalExtraFields() :
-            $entry->getCdExtraFields();
+            $entry->getLocalExtraFields() : $entry->getCdExtraFields();
         $extraData = '';
 
         foreach ($collection as $extraField) {
@@ -465,7 +464,7 @@ 
             $offset += $read;
         }
 
-        return (int) hexdec(hash_final($contextHash));
+        return (int)hexdec(hash_final($contextHash));
     }
 
     /**
@@ -769,7 +768,7 @@ 
             // find max software version, version needed to extract and most common platform
             list($softwareVersion, $versionNeededToExtract) = array_reduce(
                 $this->zipContainer->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->getExtractVersion() & 0xFF);
 

src/IO/ZipReader.php

Spacing +3 added lines, -5 removed lines

@@ -514,8 +514,7 @@ 
     protected function parseExtraFields($buffer, ZipEntry $zipEntry, $local = false)
     {
         $collection = $local ?
-            $zipEntry->getLocalExtraFields() :
-            $zipEntry->getCdExtraFields();
+            $zipEntry->getLocalExtraFields() : $zipEntry->getCdExtraFields();
 
         if (!empty($buffer)) {
             $pos = 0;
@@ -538,8 +537,7 @@ 
                 if ($className !== null) {
                     try {
                         $extraField = $local ?
-                            \call_user_func([$className, 'unpackLocalFileData'], $bufferData, $zipEntry) :
-                            \call_user_func([$className, 'unpackCentralDirData'], $bufferData, $zipEntry);
+                            \call_user_func([$className, 'unpackLocalFileData'], $bufferData, $zipEntry) : \call_user_func([$className, 'unpackCentralDirData'], $bufferData, $zipEntry);
                     } catch (\Throwable $e) {
                         throw new \RuntimeException(
                             sprintf(
@@ -838,7 +836,7 @@ 
                     $offset += $length;
                 }
 
-                $expectedCrc = (int) hexdec(hash_final($contextHash));
+                $expectedCrc = (int)hexdec(hash_final($contextHash));
 
                 if ($expectedCrc !== $entry->getCrc()) {
                     throw new Crc32Exception($entry->getName(), $expectedCrc, $entry->getCrc());

src/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
         );
@@ -73,9 +73,9 @@ 
              * @param ZipEntry $entry
              * @param string   $entryName
              */
-            function (ZipEntry $entry, $entryName) use ($regexp) {
+            function(ZipEntry $entry, $entryName) use ($regexp) {
                 if (preg_match($regexp, $entryName)) {
-                    $this->matches[] = (string) $entryName;
+                    $this->matches[] = (string)$entryName;
                 }
             }
         );
@@ -108,7 +108,7 @@ 
             array_walk(
                 $this->matches,
                 /** @param string $entryName */
-                static function ($entryName) use ($callable) {
+                static function($entryName) use ($callable) {
                     $callable($entryName);
                 }
             );
@@ -128,7 +128,7 @@ 
         array_walk(
             $this->matches,
             /** @param string $entryName */
-            function ($entryName) {
+            function($entryName) {
                 $this->zipContainer->deleteEntry($entryName);
             }
         );
@@ -144,7 +144,7 @@ 
         array_walk(
             $this->matches,
             /** @param string $entryName */
-            function ($entryName) use ($password, $encryptionMethod) {
+            function($entryName) use ($password, $encryptionMethod) {
                 $entry = $this->zipContainer->getEntry($entryName);
 
                 if (!$entry->isDirectory()) {
@@ -162,7 +162,7 @@ 
         array_walk(
             $this->matches,
             /** @param string $entryName */
-            function ($entryName) use ($encryptionMethod) {
+            function($entryName) use ($encryptionMethod) {
                 $entry = $this->zipContainer->getEntry($entryName);
 
                 if (!$entry->isDirectory()) {
@@ -177,7 +177,7 @@ 
         array_walk(
             $this->matches,
             /** @param string $entryName */
-            function ($entryName) {
+            function($entryName) {
                 $entry = $this->zipContainer->getEntry($entryName);
 
                 if (!$entry->isDirectory()) {

src/Model/ZipEntry.php

Spacing +37 added lines, -38 removed lines

@@ -206,19 +206,19 @@ 
         $charset
     ) {
         $entry = new self($name);
-        $entry->createdOS = (int) $createdOS;
-        $entry->extractedOS = (int) $extractedOS;
-        $entry->softwareVersion = (int) $softwareVersion;
-        $entry->extractVersion = (int) $extractVersion;
-        $entry->compressionMethod = (int) $compressionMethod;
-        $entry->generalPurposeBitFlags = (int) $gpbf;
-        $entry->dosTime = (int) $dosTime;
-        $entry->crc = (int) $crc;
-        $entry->compressedSize = (int) $compressedSize;
-        $entry->uncompressedSize = (int) $uncompressedSize;
-        $entry->internalAttributes = (int) $internalAttributes;
-        $entry->externalAttributes = (int) $externalAttributes;
-        $entry->localHeaderOffset = (int) $offsetLocalHeader;
+        $entry->createdOS = (int)$createdOS;
+        $entry->extractedOS = (int)$extractedOS;
+        $entry->softwareVersion = (int)$softwareVersion;
+        $entry->extractVersion = (int)$extractVersion;
+        $entry->compressionMethod = (int)$compressionMethod;
+        $entry->generalPurposeBitFlags = (int)$gpbf;
+        $entry->dosTime = (int)$dosTime;
+        $entry->crc = (int)$crc;
+        $entry->compressedSize = (int)$compressedSize;
+        $entry->uncompressedSize = (int)$uncompressedSize;
+        $entry->internalAttributes = (int)$internalAttributes;
+        $entry->externalAttributes = (int)$externalAttributes;
+        $entry->localHeaderOffset = (int)$offsetLocalHeader;
         $entry->setComment($comment);
         $entry->setCharset($charset);
         $entry->updateCompressionLevel();
@@ -239,13 +239,13 @@ 
             throw new InvalidArgumentException('zip entry name is null');
         }
 
-        $name = ltrim((string) $name, '\\/');
+        $name = ltrim((string)$name, '\\/');
 
         if ($name === '') {
             throw new InvalidArgumentException('Empty zip entry name');
         }
 
-        $name = (string) $name;
+        $name = (string)$name;
         $length = \strlen($name);
 
         if ($length > 0xffff) {
@@ -371,7 +371,7 @@ 
      */
     public function setCreatedOS($platform)
     {
-        $platform = (int) $platform;
+        $platform = (int)$platform;
 
         if ($platform < 0x00 || $platform > 0xff) {
             throw new InvalidArgumentException('Platform out of range');
@@ -398,7 +398,7 @@ 
      */
     public function setExtractedOS($platform)
     {
-        $platform = (int) $platform;
+        $platform = (int)$platform;
 
         if ($platform < 0x00 || $platform > 0xff) {
             throw new InvalidArgumentException('Platform out of range');
@@ -427,7 +427,7 @@ 
      */
     public function setSoftwareVersion($softwareVersion)
     {
-        $this->softwareVersion = (int) $softwareVersion;
+        $this->softwareVersion = (int)$softwareVersion;
 
         return $this;
     }
@@ -467,8 +467,7 @@ 
             }
 
             return $this->getCompressionMethod() === ZipCompressionMethod::DEFLATED || $this->isDirectory() ?
-                ZipVersion::v20_DEFLATED_FOLDER_ZIPCRYPTO :
-                ZipVersion::v10_DEFAULT_MIN;
+                ZipVersion::v20_DEFLATED_FOLDER_ZIPCRYPTO : ZipVersion::v10_DEFAULT_MIN;
         }
 
         return $this->extractVersion;
@@ -499,7 +498,7 @@ 
      */
     public function setExtractVersion($version)
     {
-        $this->extractVersion = max(ZipVersion::v10_DEFAULT_MIN, (int) $version);
+        $this->extractVersion = max(ZipVersion::v10_DEFAULT_MIN, (int)$version);
 
         return $this;
     }
@@ -599,7 +598,7 @@ 
      */
     public function setLocalHeaderOffset($localHeaderOffset)
     {
-        $this->localHeaderOffset = (int) $localHeaderOffset;
+        $this->localHeaderOffset = (int)$localHeaderOffset;
 
         return $this;
     }
@@ -728,7 +727,7 @@ 
      */
     public function enableDataDescriptor($enabled = true)
     {
-        $this->setGeneralBitFlag(GeneralPurposeBitFlag::DATA_DESCRIPTOR, (bool) $enabled);
+        $this->setGeneralBitFlag(GeneralPurposeBitFlag::DATA_DESCRIPTOR, (bool)$enabled);
     }
 
     /**
@@ -736,7 +735,7 @@ 
      */
     public function enableUtf8Name($enabled)
     {
-        $this->setGeneralBitFlag(GeneralPurposeBitFlag::UTF8, (bool) $enabled);
+        $this->setGeneralBitFlag(GeneralPurposeBitFlag::UTF8, (bool)$enabled);
     }
 
     /**
@@ -789,7 +788,7 @@ 
      */
     private function setEncrypted($encrypted)
     {
-        $encrypted = (bool) $encrypted;
+        $encrypted = (bool)$encrypted;
         $this->setGeneralBitFlag(GeneralPurposeBitFlag::ENCRYPTION, $encrypted);
 
         return $this;
@@ -903,7 +902,7 @@ 
      */
     public function setDosTime($dosTime)
     {
-        $dosTime = (int) $dosTime;
+        $dosTime = (int)$dosTime;
 
         if ($dosTime < 0x00000000 || $dosTime > 0xffffffff) {
             throw new InvalidArgumentException('DosTime out of range');
@@ -952,7 +951,7 @@ 
      */
     public function setExternalAttributes($externalAttributes)
     {
-        $this->externalAttributes = (int) $externalAttributes;
+        $this->externalAttributes = (int)$externalAttributes;
 
         return $this;
     }
@@ -976,7 +975,7 @@ 
      */
     public function setInternalAttributes($attributes)
     {
-        $this->internalAttributes = (int) $attributes;
+        $this->internalAttributes = (int)$attributes;
 
         return $this;
     }
@@ -1007,7 +1006,7 @@ 
      */
     public function getCdExtraField($headerId)
     {
-        return $this->cdExtraFields->get((int) $headerId);
+        return $this->cdExtraFields->get((int)$headerId);
     }
 
     /**
@@ -1037,7 +1036,7 @@ 
      */
     public function getLocalExtraField($headerId)
     {
-        return $this->localExtraFields[(int) $headerId];
+        return $this->localExtraFields[(int)$headerId];
     }
 
     /**
@@ -1059,7 +1058,7 @@ 
      */
     public function getExtraField($headerId)
     {
-        $headerId = (int) $headerId;
+        $headerId = (int)$headerId;
         $local = $this->getLocalExtraField($headerId);
 
         if ($local === null) {
@@ -1076,7 +1075,7 @@ 
      */
     public function hasExtraField($headerId)
     {
-        $headerId = (int) $headerId;
+        $headerId = (int)$headerId;
 
         return
             isset($this->localExtraFields[$headerId]) ||
@@ -1088,7 +1087,7 @@ 
      */
     public function removeExtraField($headerId)
     {
-        $headerId = (int) $headerId;
+        $headerId = (int)$headerId;
 
         $this->cdExtraFields->remove($headerId);
         $this->localExtraFields->remove($headerId);
@@ -1156,7 +1155,7 @@ 
      */
     public function setCrc($crc)
     {
-        $this->crc = (int) $crc;
+        $this->crc = (int)$crc;
 
         return $this;
     }
@@ -1188,7 +1187,7 @@ 
                 $this->password = null;
                 $this->disableEncryption();
             } else {
-                $this->password = (string) $password;
+                $this->password = (string)$password;
                 $this->setEncrypted(true);
             }
         }
@@ -1223,7 +1222,7 @@ 
             $encryptionMethod = ZipEncryptionMethod::NONE;
         }
 
-        $encryptionMethod = (int) $encryptionMethod;
+        $encryptionMethod = (int)$encryptionMethod;
         ZipEncryptionMethod::checkSupport($encryptionMethod);
         $this->encryptionMethod = $encryptionMethod;
 
@@ -1247,7 +1246,7 @@ 
      */
     public function setCompressionLevel($compressionLevel)
     {
-        $compressionLevel = (int) $compressionLevel;
+        $compressionLevel = (int)$compressionLevel;
 
         if ($compressionLevel === self::UNKNOWN) {
             $compressionLevel = ZipCompressionLevel::NORMAL;
@@ -1309,7 +1308,7 @@ 
      */
     public function setUnixMode($mode)
     {
-        $mode = (int) $mode;
+        $mode = (int)$mode;
         $this->setExternalAttributes(
             ($mode << 16)
             // MS-DOS read-only attribute