Ne-Lexa / php-zip

src/ZipFile.php

Spacing +31 added lines, -35 removed lines

@@ -391,7 +391,7 @@ 
 
         if (!empty($entries)) {
             if (\is_string($entries)) {
-                $entries = (array) $entries;
+                $entries = (array)$entries;
             }
 
             if (\is_array($entries)) {
@@ -545,12 +545,12 @@ 
             throw new InvalidArgumentException('Contents is null');
         }
 
-        $entryName = ltrim((string) $entryName, '\\/');
+        $entryName = ltrim((string)$entryName, '\\/');
 
         if ($entryName === '') {
             throw new InvalidArgumentException('Empty entry name');
         }
-        $contents = (string) $contents;
+        $contents = (string)$contents;
         $length = \strlen($contents);
 
         if ($compressionMethod === null || $compressionMethod === ZipEntry::UNKNOWN) {
@@ -559,8 +559,7 @@ 
             } else {
                 $mimeType = FilesUtil::getMimeTypeFromString($contents);
                 $compressionMethod = FilesUtil::isBadCompressionMimeType($mimeType) ?
-                    ZipCompressionMethod::STORED :
-                    ZipCompressionMethod::DEFLATED;
+                    ZipCompressionMethod::STORED : ZipCompressionMethod::DEFLATED;
             }
         }
 
@@ -643,7 +642,7 @@ 
             }
         }
 
-        $entryName = ltrim((string) $entryName, '\\/');
+        $entryName = ltrim((string)$entryName, '\\/');
 
         if ($entryName === '') {
             throw new InvalidArgumentException('Empty entry name');
@@ -661,8 +660,7 @@ 
                 $compressionMethod = ZipCompressionMethod::STORED;
             } else {
                 $compressionMethod = FilesUtil::isBadCompressionFile($file->getPathname()) ?
-                    ZipCompressionMethod::STORED :
-                    ZipCompressionMethod::DEFLATED;
+                    ZipCompressionMethod::STORED : ZipCompressionMethod::DEFLATED;
             }
 
             $zipEntry->setUncompressedSize($file->getSize());
@@ -698,7 +696,7 @@ 
             if ($mtime instanceof \DateTimeInterface) {
                 $timestamp = $mtime->getTimestamp();
             } elseif (is_numeric($mtime)) {
-                $timestamp = (int) $mtime;
+                $timestamp = (int)$mtime;
             } elseif (\is_string($mtime)) {
                 $timestamp = strtotime($mtime);
 
@@ -784,7 +782,7 @@ 
         if ($entryName === null) {
             throw new InvalidArgumentException('Entry name is null');
         }
-        $entryName = ltrim((string) $entryName, '\\/');
+        $entryName = ltrim((string)$entryName, '\\/');
 
         if ($entryName === '') {
             throw new InvalidArgumentException('Empty entry name');
@@ -794,7 +792,7 @@ 
         $zipEntry = new ZipEntry($entryName);
 
         if ($fstat !== false) {
-            $unixMode = (int) sprintf('%o', $fstat['mode']);
+            $unixMode = (int)sprintf('%o', $fstat['mode']);
             $length = $fstat['size'];
 
             if ($compressionMethod === null || $compressionMethod === ZipEntry::UNKNOWN) {
@@ -806,8 +804,7 @@ 
                     rewind($stream);
                     $mimeType = FilesUtil::getMimeTypeFromString($bufferContents);
                     $compressionMethod = FilesUtil::isBadCompressionMimeType($mimeType) ?
-                        ZipCompressionMethod::STORED :
-                        ZipCompressionMethod::DEFLATED;
+                        ZipCompressionMethod::STORED : ZipCompressionMethod::DEFLATED;
                 }
                 $zipEntry->setUncompressedSize($length);
             }
@@ -845,7 +842,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');
@@ -887,7 +884,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');
@@ -926,7 +923,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');
@@ -965,7 +962,7 @@ 
         $localPath = '/',
         $compressionMethod = null
     ) {
-        $localPath = (string) $localPath;
+        $localPath = (string)$localPath;
 
         if ($localPath !== '') {
             $localPath = trim($localPath, '\\/');
@@ -974,8 +971,7 @@ 
         }
 
         $iterator = $iterator instanceof \RecursiveIterator ?
-            new \RecursiveIteratorIterator($iterator) :
-            new \IteratorIterator($iterator);
+            new \RecursiveIteratorIterator($iterator) : new \IteratorIterator($iterator);
         /**
          * @var string[] $files
          * @var string   $path
@@ -1056,7 +1052,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');
@@ -1065,7 +1061,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');
@@ -1152,12 +1148,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');
@@ -1263,8 +1259,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->zipContainer->renameEntry($oldName, $newName);
@@ -1284,7 +1280,7 @@ 
      */
     public function deleteFromName($entryName)
     {
-        $entryName = ltrim((string) $entryName, '\\/');
+        $entryName = ltrim((string)$entryName, '\\/');
 
         if (!$this->zipContainer->deleteEntry($entryName)) {
             throw new ZipEntryNotFoundException($entryName);
@@ -1357,7 +1353,7 @@ 
     {
         $this->matcher()->all()->invoke(
             /** @param string $entry */
-            function ($entry) use ($compressionLevel) {
+            function($entry) use ($compressionLevel) {
                 $this->setCompressionLevelEntry($entry, $compressionLevel);
             }
         );
@@ -1380,7 +1376,7 @@ 
      */
     public function setCompressionLevelEntry($entryName, $compressionLevel)
     {
-        $compressionLevel = (int) $compressionLevel;
+        $compressionLevel = (int)$compressionLevel;
         $this->getEntry($entryName)->setCompressionLevel($compressionLevel);
 
         return $this;
@@ -1570,7 +1566,7 @@ 
      */
     public function saveAsFile($filename)
     {
-        $filename = (string) $filename;
+        $filename = (string)$filename;
 
         $tempFilename = $filename . '.temp' . uniqid('', true);
 
@@ -1623,7 +1619,7 @@ 
      */
     public function outputAsAttachment($outputFilename, $mimeType = null, $attachment = true)
     {
-        $outputFilename = (string) $outputFilename;
+        $outputFilename = (string)$outputFilename;
 
         if ($mimeType === null) {
             $mimeType = $this->getMimeTypeByFilename($outputFilename);
@@ -1663,7 +1659,7 @@ 
      */
     protected function getMimeTypeByFilename($outputFilename)
     {
-        $outputFilename = (string) $outputFilename;
+        $outputFilename = (string)$outputFilename;
         $ext = strtolower(pathinfo($outputFilename, \PATHINFO_EXTENSION));
 
         if (!empty($ext) && isset(self::$defaultMimeTypes[$ext])) {
@@ -1687,7 +1683,7 @@ 
      */
     public function outputAsResponse(ResponseInterface $response, $outputFilename, $mimeType = null, $attachment = true)
     {
-        $outputFilename = (string) $outputFilename;
+        $outputFilename = (string)$outputFilename;
 
         if ($mimeType === null) {
             $mimeType = $this->getMimeTypeByFilename($outputFilename);
@@ -1711,7 +1707,7 @@ 
 
         if ($size !== null) {
             /** @noinspection CallableParameterUseCaseInTypeContextInspection */
-            $response = $response->withHeader('Content-Length', (string) $size);
+            $response = $response->withHeader('Content-Length', (string)$size);
         }
 
         return $response
@@ -1837,7 +1833,7 @@ 
         if ($entryName === null) {
             throw new InvalidArgumentException('Key must not be null, but must contain the name of the zip entry.');
         }
-        $entryName = ltrim((string) $entryName, '\\/');
+        $entryName = ltrim((string)$entryName, '\\/');
 
         if ($entryName === '') {
             throw new InvalidArgumentException('Key is empty, but must contain the name of the zip entry.');
@@ -1852,7 +1848,7 @@ 
         } elseif (\is_resource($contents)) {
             $this->addFromStream($contents, $entryName);
         } else {
-            $this->addFromString($entryName, (string) $contents);
+            $this->addFromString($entryName, (string)$contents);
         }
     }