wapmorgan / UnifiedArchive

src/Drivers/Zip.php

Braces +36 added lines, -24 removed lines

@@ -86,8 +86,9 @@ 
     {
         parent::__construct($archiveFileName, $format);
         $this->open($archiveFileName);
-        if ($password !== null)
-            $this->zip->setPassword($password);
+        if ($password !== null) {
+                    $this->zip->setPassword($password);
+        }
     }
 
     /**
@@ -121,8 +122,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file = $this->zip->statIndex($i);
             // skip directories
-            if (in_array(substr($file['name'], -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file['name'], -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $this->pureFilesNumber++;
             $information->files[$i] = $file['name'];
             $information->compressedFilesSize += $file['comp_size'];
@@ -157,8 +159,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file_name = $this->zip->getNameIndex($i);
             // skip directories
-            if (in_array(substr($file_name, -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file_name, -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $files[] = $file_name;
         }
         return $files;
@@ -203,8 +206,9 @@ 
     public function getFileContent($fileName)
     {
         $result = $this->zip->getFromName($fileName);
-        if ($result === false)
-            throw new Exception('Could not get file information: '.$result.'. May use password?');
+        if ($result === false) {
+                    throw new Exception('Could not get file information: '.$result.'. May use password?');
+        }
         return $result;
     }
 
@@ -225,8 +229,9 @@ 
      */
     public function extractFiles($outputFolder, array $files)
     {
-        if ($this->zip->extractTo($outputFolder, $files) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder, $files) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return count($files);
     }
@@ -238,8 +243,9 @@ 
      */
     public function extractArchive($outputFolder)
     {
-        if ($this->zip->extractTo($outputFolder) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return $this->pureFilesNumber;
     }
@@ -254,8 +260,9 @@ 
     {
         $count = 0;
         foreach ($files as $file) {
-            if ($this->zip->deleteName($file) === false)
-                throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            if ($this->zip->deleteName($file) === false) {
+                            throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            }
             $count++;
         }
 
@@ -278,11 +285,13 @@ 
         $added_files = 0;
         foreach ($files as $localName => $fileName) {
             if (is_null($fileName)) {
-                if ($this->zip->addEmptyDir($localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
             } else {
-                if ($this->zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
                 $added_files++;
             }
         }
@@ -335,8 +344,9 @@ 
         $zip = new ZipArchive();
         $result = $zip->open($archiveFileName, ZipArchive::CREATE);
 
-        if ($result !== true)
-            throw new ArchiveCreationException('ZipArchive error: '.$result);
+        if ($result !== true) {
+                    throw new ArchiveCreationException('ZipArchive error: '.$result);
+        }
 
         $can_set_compression_level = method_exists($zip, 'setCompressionName');
         $can_encrypt = static::canEncrypt(Formats::ZIP);
@@ -354,11 +364,13 @@ 
 
         foreach ($files as $localName => $fileName) {
             if ($fileName === null) {
-                if ($zip->addEmptyDir($localName) === false)
-                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                }
             } else {
-                if ($zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                }
                 if ($can_set_compression_level) {
                     $zip->setCompressionName($localName, $compressionLevelMap[$compressionLevel]);
                 }

src/Drivers/TarByPear.php

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
      */
     public static function getInstallationInstruction()
     {
-        return 'install library [pear/archive_tar]: `composer require pear/archive_tar`' . "\n"  . ' and optionally php-extensions (zlib, bz2)';
+        return 'install library [pear/archive_tar]: `composer require pear/archive_tar`'."\n".' and optionally php-extensions (zlib, bz2)';
     }
 
     /**
@@ -160,7 +160,7 @@ 
                 $compression = 'lzma2';
                 break;
             case 'z':
-                $tar_aname = 'compress.lzw://' . $archiveFileName;
+                $tar_aname = 'compress.lzw://'.$archiveFileName;
                 break;
         }
 
@@ -217,7 +217,7 @@ 
 
             case Formats::TAR_LZW:
                 LzwStreamWrapper::registerWrapper();
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->fileName);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->fileName);
                 break;
 
             default:
@@ -335,7 +335,7 @@ 
         $result = $this->tar->extractList($files, $outputFolder);
         if ($result === false) {
             if (isset($this->tar->error_object)) {
-                throw new ArchiveExtractionException('Error when extracting from ' . $this->fileName . ': ' . $this->tar->error_object->getMessage(0));
+                throw new ArchiveExtractionException('Error when extracting from '.$this->fileName.': '.$this->tar->error_object->getMessage(0));
             }
             throw new ArchiveExtractionException('Error when extracting from '.$this->fileName);
         }
@@ -351,7 +351,7 @@ 
         $result = $this->tar->extract($outputFolder);
         if ($result === false) {
             if (isset($this->tar->error_object)) {
-                throw new ArchiveExtractionException('Error when extracting ' . $this->fileName . ': '
+                throw new ArchiveExtractionException('Error when extracting '.$this->fileName.': '
                                                      . $this->tar->error_object->toString()
                 );
             }

src/Drivers/AlchemyZippy.php

Spacing +7 added lines, -7 removed lines

@@ -63,9 +63,9 @@ 
     public static function getInstallationInstruction()
     {
         self::init();
-        return 'install library [alchemy/zippy]: `composer require alchemy/zippy`' . "\n"  . ' and console programs (tar, zip): `apt install tar zip` - depends on OS'
-            . "\n" . 'If you install SevenZip and AlchemyZippy:' . "\n" .
-            '1. You should specify symfony/console version before installation to any **3.x.x version**:' . "\n" . '`composer require symfony/process:~3.4`, because they require different `symfony/process` versions.' . "\n" .
+        return 'install library [alchemy/zippy]: `composer require alchemy/zippy`'."\n".' and console programs (tar, zip): `apt install tar zip` - depends on OS'
+            . "\n".'If you install SevenZip and AlchemyZippy:'."\n".
+            '1. You should specify symfony/console version before installation to any **3.x.x version**:'."\n".'`composer require symfony/process:~3.4`, because they require different `symfony/process` versions.'."\n".
             '2. Install archive7z version 4.0.0: `composer require gemorroj/archive7z:~4.0`';
     }
 
@@ -190,8 +190,8 @@ 
 
             $this->files[] = $information->files[] = str_replace('\\', '/', $member->getLocation());
             $this->members[str_replace('\\', '/', $member->getLocation())] = $member;
-            $information->compressedFilesSize += (int)$member->getSize();
-            $information->uncompressedFilesSize += (int)$member->getSize();
+            $information->compressedFilesSize += (int) $member->getSize();
+            $information->uncompressedFilesSize += (int) $member->getSize();
         }
         return $information;
     }
@@ -240,7 +240,7 @@ 
     public function getFileContent($fileName)
     {
         $member = $this->getMember($fileName);
-        return (string)$member;
+        return (string) $member;
     }
 
     /**
@@ -249,7 +249,7 @@ 
     public function getFileStream($fileName)
     {
         $member = $this->getMember($fileName);
-        return self::wrapStringInStream((string)$member);
+        return self::wrapStringInStream((string) $member);
     }
 
     /**

src/Drivers/Iso.php

Braces +18 added lines, -11 removed lines

@@ -84,8 +84,9 @@ 
     {
         parent::__construct($archiveFileName, $format);
         $this->open($archiveFileName);
-        if ($password !== null)
-            throw new UnsupportedOperationException('Iso archive does not support password!');
+        if ($password !== null) {
+                    throw new UnsupportedOperationException('Iso archive does not support password!');
+        }
     }
 
     /**
@@ -108,8 +109,9 @@ 
 
         /** @var \CVolumeDescriptor $usedDesc */
         $usedDesc = $this->iso->GetDescriptor(SUPPLEMENTARY_VOLUME_DESC);
-        if (!$usedDesc)
-            $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        if (!$usedDesc) {
+                    $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        }
         $this->blockSize = $usedDesc->iBlockSize;
         $directories = $usedDesc->LoadMPathTable($this->iso);
         // iterate over all directories
@@ -130,8 +132,9 @@ 
             if ($files) {
                 /** @var \CFileDirDescriptors $file */
                 foreach ($files as $file) {
-                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory())
-                        continue;
+                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory()) {
+                                            continue;
+                    }
                     $this->files[$file->Location] = $directory.$file->strd_FileId;
                     $this->filesSize += $file->DataLen;
 
@@ -183,8 +186,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->filesData[$fileName]))
-            return false;
+        if (!isset($this->filesData[$fileName])) {
+                    return false;
+        }
 
         return new ArchiveEntry($fileName, $this->filesData[$fileName]['size'],
             $this->filesData[$fileName]['size'], $this->filesData[$fileName]['mtime'],false);
@@ -219,11 +223,14 @@ 
     protected function prepareForFileExtracting($fileName)
     {
         $Location = array_search($fileName, $this->files, true);
-        if (!isset($this->filesData[$fileName])) return false;
+        if (!isset($this->filesData[$fileName])) {
+         return false;
+        }
         $data = $this->filesData[$fileName];
         $Location_Real = $Location * $this->blockSize;
-        if ($this->iso->Seek($Location_Real, SEEK_SET) === false)
-            return false;
+        if ($this->iso->Seek($Location_Real, SEEK_SET) === false) {
+                    return false;
+        }
         return $data;
     }
 

src/Drivers/OneFile/OneFileDriver.php

Braces +9 added lines, -6 removed lines

@@ -59,10 +59,12 @@ 
      */
     public function __construct($archiveFileName, $format, $password = null)
     {
-        if (static::FORMAT_SUFFIX === null)
-            throw new \Exception('Format should be initialized');
-        if ($password !== null)
-            throw new UnsupportedOperationException(self::FORMAT_SUFFIX.' archive does not support password!');
+        if (static::FORMAT_SUFFIX === null) {
+                    throw new \Exception('Format should be initialized');
+        }
+        if ($password !== null) {
+                    throw new UnsupportedOperationException(self::FORMAT_SUFFIX.' archive does not support password!');
+        }
 
         parent::__construct($archiveFileName, $format);
 
@@ -131,8 +133,9 @@ 
     public function extractArchive($outputFolder)
     {
         $data = $this->getFileContent($this->inArchiveFileName);
-        if ($data === false)
-            throw new ArchiveExtractionException('Could not extract archive');
+        if ($data === false) {
+                    throw new ArchiveExtractionException('Could not extract archive');
+        }
 
         $size = strlen($data);
         $written = file_put_contents($outputFolder.$this->inArchiveFileName, $data);

src/Drivers/TarByPhar.php

Spacing +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
      */
     public function getFileStream($fileName)
     {
-        return fopen('phar://'.$this->fileName . '/' . $fileName, 'rb');
+        return fopen('phar://'.$this->fileName.'/'.$fileName, 'rb');
     }
 
     /**

src/Drivers/Cab.php

Braces +3 added lines, -2 removed lines

@@ -82,8 +82,9 @@
     public function __construct($archiveFileName, $format, $password = null)
     {
         parent::__construct($archiveFileName, $format);
-        if ($password !== null)
-            throw new UnsupportedOperationException('Cab archive does not support password!');
+        if ($password !== null) {
+                    throw new UnsupportedOperationException('Cab archive does not support password!');
+        }
         $this->open($archiveFileName);
     }
 

src/Commands/TestCommand.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
         $errored = [];
         foreach ($files as $file) {
-            $output->write($file . ' ... ');
+            $output->write($file.' ... ');
             if ($archive->test($file) === true) {
                 $output->writeln('<info>ok</info>');
             } else {

src/Commands/InfoCommand.php

Spacing +7 added lines, -7 removed lines

@@ -27,15 +27,15 @@
         $file = realpath($input->getArgument('archive'));
         $archive = $this->getArchive($input, $output);
 
-        $output->writeln('Filename: ' . $file . ' (changed <comment>' . $this->formatDate(filemtime($file)) . '</comment>)');
-        $output->writeln('Type: <info>' . $archive->getFormat() . '</info>, mime <info>' . $archive->getMimeType() . '</info> (via driver <comment>' . $archive->getDriverType() . '</comment>)');
-        $output->writeln('Contains: ' . $archive->countFiles() . ' file' . ($archive->countFiles() > 1 ? 's' : null));
+        $output->writeln('Filename: '.$file.' (changed <comment>'.$this->formatDate(filemtime($file)).'</comment>)');
+        $output->writeln('Type: <info>'.$archive->getFormat().'</info>, mime <info>'.$archive->getMimeType().'</info> (via driver <comment>'.$archive->getDriverType().'</comment>)');
+        $output->writeln('Contains: '.$archive->countFiles().' file'.($archive->countFiles() > 1 ? 's' : null));
         $output->writeln('Size:');
-        $output->writeln("\t". 'uncompressed: '.implode(' ', $this->formatSize($archive->getOriginalSize(), 2)));
-        $output->writeln("\t" . 'compressed: ' . implode(' ', $this->formatSize($archive->getCompressedSize(), 2)));
-        $output->writeln("\t" . 'ratio: <info>' . round($archive->getOriginalSize() / $archive->getCompressedSize(), 6) . '/1 (' . floor($archive->getCompressedSize() / $archive->getOriginalSize() * 100) . '%</info>)');
+        $output->writeln("\t".'uncompressed: '.implode(' ', $this->formatSize($archive->getOriginalSize(), 2)));
+        $output->writeln("\t".'compressed: '.implode(' ', $this->formatSize($archive->getCompressedSize(), 2)));
+        $output->writeln("\t".'ratio: <info>'.round($archive->getOriginalSize() / $archive->getCompressedSize(), 6).'/1 ('.floor($archive->getCompressedSize() / $archive->getOriginalSize() * 100).'%</info>)');
         if ($archive->getDriver()->checkAbility(BasicDriver::GET_COMMENT) && !empty($comment = $archive->getComment()))
-            $output->writeln('Comment: <comment>' . $comment . '</comment>');
+            $output->writeln('Comment: <comment>'.$comment.'</comment>');
 
         return 0;
     }

Braces +3 added lines, -2 removed lines

@@ -34,8 +34,9 @@
         $output->writeln("\t". 'uncompressed: '.implode(' ', $this->formatSize($archive->getOriginalSize(), 2)));
         $output->writeln("\t" . 'compressed: ' . implode(' ', $this->formatSize($archive->getCompressedSize(), 2)));
         $output->writeln("\t" . 'ratio: <info>' . round($archive->getOriginalSize() / $archive->getCompressedSize(), 6) . '/1 (' . floor($archive->getCompressedSize() / $archive->getOriginalSize() * 100) . '%</info>)');
-        if ($archive->getDriver()->checkAbility(BasicDriver::GET_COMMENT) && !empty($comment = $archive->getComment()))
-            $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        if ($archive->getDriver()->checkAbility(BasicDriver::GET_COMMENT) && !empty($comment = $archive->getComment())) {
+                    $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        }
 
         return 0;
     }