wapmorgan / UnifiedArchive

src/Drivers/OneFile/Bzip.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class Bzip extends OneFileDriver
 {
-    const FORMAT_SUFFIX =  'bz2';
+    const FORMAT_SUFFIX = 'bz2';
     const PHP_EXTENSION = 'bz2';
     const FORMAT = Formats::BZIP;
 

src/Drivers/OneFile/OneFileDriver.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 
     public static function getInstallationInstruction()
     {
-        return 'install `' . static::PHP_EXTENSION . '` extension';
+        return 'install `'.static::PHP_EXTENSION.'` extension';
     }
 
     public static function getSupportedFormats()

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/OneFile/Lzma.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
  */
 class Lzma extends OneFileDriver
 {
-    const FORMAT_SUFFIX =  'xz';
+    const FORMAT_SUFFIX = 'xz';
     const PHP_EXTENSION = 'xz';
     const FORMAT = Formats::LZMA;
 
@@ -30,7 +30,7 @@ 
      */
     public static function getInstallationInstruction()
     {
-        return 'install [xz] extension' . "\n" . 'For 5.x: https://github.com/payden/php-xz' . "\n" . 'For 7.x/8.x: https://github.com/codemasher/php-ext-xz';
+        return 'install [xz] extension'."\n".'For 5.x: https://github.com/payden/php-xz'."\n".'For 7.x/8.x: https://github.com/codemasher/php-ext-xz';
     }
 
     /**

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()
                 );
             }

Braces +23 added lines, -16 removed lines

@@ -164,10 +164,11 @@ 
                 break;
         }
 
-        if (isset($tar_aname))
-            $tar = new Archive_Tar($tar_aname, $compression);
-        else
-            $tar = new Archive_Tar($archiveFileName, $compression);
+        if (isset($tar_aname)) {
+                    $tar = new Archive_Tar($tar_aname, $compression);
+        } else {
+                    $tar = new Archive_Tar($archiveFileName, $compression);
+        }
 
         $current_file = 0;
         $total_files = count($files);
@@ -179,8 +180,9 @@ 
 //                if ($tar->addString($localName, '') === false)
 //                    throw new ArchiveCreationException('Error when adding directory '.$localName.' to archive');
             } else {
-                if ($tar->addModify($filename, $add_dir, $remove_dir) === false)
-                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                if ($tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                }
             }
             if ($fileProgressCallable !== null) {
                 call_user_func_array($fileProgressCallable, [$current_file++, $total_files, $filename, $localName]);
@@ -241,8 +243,9 @@ 
                 continue;
             }
             // skip directories
-            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/')
-                continue;
+            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/') {
+                            continue;
+            }
             $information->files[] = $file['filename'];
             $information->uncompressedFilesSize += $file['size'];
             $this->pearFilesIndex[$file['filename']] = $i;
@@ -288,14 +291,16 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         $index = $this->pearFilesIndex[$fileName];
 
         $files_list = $this->tar->listContent();
-        if (!isset($files_list[$index]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        if (!isset($files_list[$index])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        }
 
         $data = $files_list[$index];
         unset($files_list);
@@ -310,8 +315,9 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return $this->tar->extractInString($fileName);
     }
@@ -321,8 +327,9 @@ 
      */
     public function getFileStream($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return self::wrapStringInStream($this->tar->extractInString($fileName));
     }

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;
     }

src/Commands/BaseCommand.php

Spacing +4 added lines, -4 removed lines

@@ -114,10 +114,10 @@
     protected function resolveDriverName($driver)
     {
         if (strpos($driver, '\\') === false) {
-            if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\' . $driver)) {
-                $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\' . $driver;
-            } else if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\' . $driver)) {
-                $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\' . $driver;
+            if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\'.$driver)) {
+                $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\'.$driver;
+            } else if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\'.$driver)) {
+                $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\'.$driver;
             }
         }
         if ($driver[0] !== '\\') {

Braces +16 added lines, -13 removed lines

@@ -43,12 +43,14 @@ 
      */
     protected function open($file, $password = null)
     {
-        if (!UnifiedArchive::canOpen($file))
-            throw new \Exception('Could not open archive '.$file.'. Try installing suggested packages or run `cam -f` to see formats support.');
+        if (!UnifiedArchive::canOpen($file)) {
+                    throw new \Exception('Could not open archive '.$file.'. Try installing suggested packages or run `cam -f` to see formats support.');
+        }
 
         $archive = UnifiedArchive::open($file, [], $password);
-        if ($archive === null)
-            throw new \Exception('Could not open archive '.$file);
+        if ($archive === null) {
+                    throw new \Exception('Could not open archive '.$file);
+        }
 
         return $archive;
     }
@@ -61,17 +63,18 @@ 
      */
     public function formatDate($unixtime)
     {
-        if (strtotime('today') < $unixtime)
-            return 'Today, '.date('G:m', $unixtime);
-        else if (strtotime('yesterday') < $unixtime)
-            return 'Yesterday, '.date('G:m', $unixtime);
-        else {
+        if (strtotime('today') < $unixtime) {
+                    return 'Today, '.date('G:m', $unixtime);
+        } else if (strtotime('yesterday') < $unixtime) {
+                    return 'Yesterday, '.date('G:m', $unixtime);
+        } else {
             $datetime = new \DateTime();
             $datetime->setTimestamp($unixtime);
-            if ($datetime->format('Y') == date('Y'))
-                return $datetime->format('d M, H:m');
-            else
-                return $datetime->format('d M Y, H:m');
+            if ($datetime->format('Y') == date('Y')) {
+                            return $datetime->format('d M, H:m');
+            } else {
+                            return $datetime->format('d M Y, H:m');
+            }
         }
     }
 

src/Commands/FormatsCommand.php

Spacing +3 added lines, -3 removed lines

@@ -33,9 +33,9 @@ 
         if ($driver !== null) {
             $driver = $this->resolveDriverName($driver);
             if (!class_exists($driver) || !is_a($driver, BasicDriver::class, true)) {
-                throw new \InvalidArgumentException('Class "' . $driver . '" not found or not in BasicDriver children');
+                throw new \InvalidArgumentException('Class "'.$driver.'" not found or not in BasicDriver children');
             }
-            $output->writeln('Supported formats by <info>' . $driver . '</info>');
+            $output->writeln('Supported formats by <info>'.$driver.'</info>');
 
             $table->setHeaders(['format', ...array_keys(self::$abilitiesLabels)]);
             foreach ($driver::getSupportedFormats() as $i => $format) {
@@ -86,7 +86,7 @@ 
         $table->render();
 
         foreach (array_combine(array_values(self::$abilitiesShortCuts), array_keys(self::$abilitiesLabels)) as $shortCut => $label) {
-            $output->writeln('<info>' . $shortCut . '</info> - ' . $label);
+            $output->writeln('<info>'.$shortCut.'</info> - '.$label);
         }
 
         return 0;