wapmorgan / UnifiedArchive

src/Drivers/TarByPear.php

Braces +29 added lines, -19 removed lines

@@ -57,7 +57,9 @@ 
     public static function checkFormatSupport($format)
     {
         $availability = class_exists('\Archive_Tar');
-        if (!$availability) return false;
+        if (!$availability) {
+         return false;
+        }
         switch ($format) {
             case Formats::TAR:
                 return true;
@@ -128,21 +130,24 @@ 
                 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);
+        }
 
         foreach ($files  as $localName => $filename) {
             $remove_dir = dirname($filename);
             $add_dir = dirname($localName);
 
             if (is_null($filename)) {
-                if ($tar->addString($localName, '') === false)
-                    throw new ArchiveCreationException('Error when adding directory '.$localName.' to archive');
+                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');
+                }
             }
         }
         $tar = null;
@@ -199,8 +204,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;
@@ -245,14 +251,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);
@@ -267,8 +275,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);
     }
@@ -278,8 +287,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/Zip.php

Braces +36 added lines, -24 removed lines

@@ -64,8 +64,9 @@ 
     public function __construct($archiveFileName, $format, $password = null)
     {
         $this->open($archiveFileName);
-        if ($password !== null)
-            $this->zip->setPassword($password);
+        if ($password !== null) {
+                    $this->zip->setPassword($password);
+        }
     }
 
     /**
@@ -98,8 +99,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;
+            }
             $information->files[$i] = $file['name'];
             $information->compressedFilesSize += $file['comp_size'];
             $information->uncompressedFilesSize += $file['size'];
@@ -133,8 +135,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;
@@ -171,8 +174,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;
     }
 
@@ -193,8 +197,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);
     }
@@ -206,8 +211,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->zip->numFiles;
     }
@@ -222,8 +228,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++;
         }
 
@@ -246,11 +253,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++;
             }
         }
@@ -296,8 +305,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);
@@ -308,11 +318,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/UnifiedArchive.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
     public static function open($fileName, $password = null)
     {
         if (!file_exists($fileName) || !is_readable($fileName)) {
-            throw new InvalidArgumentException('Could not open file: ' . $fileName.' is not readable');
+            throw new InvalidArgumentException('Could not open file: '.$fileName.' is not readable');
         }
 
         $format = Formats::detectArchiveFormat($fileName);
@@ -265,7 +265,7 @@ 
     public function getFileData($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileData($fileName);
@@ -281,7 +281,7 @@ 
     public function getFileContent($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileContent($fileName);
@@ -297,7 +297,7 @@ 
     public function getFileStream($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileStream($fileName);
@@ -538,7 +538,7 @@ 
     public static function archiveFile($file, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE, $password = null)
     {
         if (!is_file($file)) {
-            throw new InvalidArgumentException($file . ' is not a valid file to archive');
+            throw new InvalidArgumentException($file.' is not a valid file to archive');
         }
 
         return static::archiveFiles($file, $archiveName, $compressionLevel, $password) === 1;

Braces +49 added lines, -35 removed lines

@@ -244,13 +244,15 @@ 
      */
     public function getFileNames($filter = null)
     {
-        if ($filter === null)
-            return $this->files;
+        if ($filter === null) {
+                    return $this->files;
+        }
 
         $result = [];
         foreach ($this->files as $file) {
-            if (fnmatch($filter, $file))
-                $result[] = $file;
+            if (fnmatch($filter, $file)) {
+                            $result[] = $file;
+            }
         }
         return $result;
     }
@@ -377,8 +379,9 @@ 
     {
         $files_list = static::createFilesList($fileOrFiles);
 
-        if (empty($files_list))
-            throw new EmptyFileListException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new EmptyFileListException('Files list is empty!');
+        }
 
         $result = $this->archive->addFiles($files_list);
         $this->scanArchive();
@@ -397,8 +400,9 @@ 
      */
     public function addFile($file, $inArchiveName = null)
     {
-        if (!is_file($file))
-            throw new InvalidArgumentException($file.' is not a valid file to add in archive');
+        if (!is_file($file)) {
+                    throw new InvalidArgumentException($file.' is not a valid file to add in archive');
+        }
 
         return ($inArchiveName !== null
                 ? $this->addFiles([$inArchiveName => $file])
@@ -431,8 +435,9 @@ 
      */
     public function addDirectory($directory, $inArchivePath = null)
     {
-        if (!is_dir($directory) || !is_readable($directory))
-            throw new InvalidArgumentException($directory.' is not a valid directory to add in archive');
+        if (!is_dir($directory) || !is_readable($directory)) {
+                    throw new InvalidArgumentException($directory.' is not a valid directory to add in archive');
+        }
 
         return ($inArchivePath !== null
                 ? $this->addFiles([$inArchivePath => $directory])
@@ -456,13 +461,15 @@ 
     {
         $archiveType = Formats::detectArchiveFormat($archiveName, false);
 
-        if ($archiveType === false)
-            throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
+        if ($archiveType === false) {
+                    throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
+        }
 
         $files_list = static::createFilesList($fileOrFiles);
 
-        if (empty($files_list))
-            throw new EmptyFileListException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new EmptyFileListException('Files list is empty!');
+        }
 
         $totalSize = 0;
         foreach ($files_list as $fn) {
@@ -507,16 +514,19 @@ 
      */
     public static function archiveFiles($fileOrFiles, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE, $password = null)
     {
-        if (file_exists($archiveName))
-            throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
+        if (file_exists($archiveName)) {
+                    throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
+        }
 
         $info = static::prepareForArchiving($fileOrFiles, $archiveName);
 
-        if (!Formats::canCreate($info['type']))
-            throw new UnsupportedArchiveException('Unsupported archive type: '.$info['type'].' of archive '.$archiveName);
+        if (!Formats::canCreate($info['type'])) {
+                    throw new UnsupportedArchiveException('Unsupported archive type: '.$info['type'].' of archive '.$archiveName);
+        }
 
-        if ($password !== null && !Formats::canEncrypt($info['type']))
-            throw new UnsupportedOperationException('Archive type '.$info['type'].' can not be encrypted');
+        if ($password !== null && !Formats::canEncrypt($info['type'])) {
+                    throw new UnsupportedOperationException('Archive type '.$info['type'].' can not be encrypted');
+        }
 
         /** @var BasicDriver $driver */
         $driver = Formats::getFormatDriver($info['type'], true);
@@ -557,8 +567,9 @@ 
      */
     public static function archiveDirectory($directory, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE, $password = null)
     {
-        if (!is_dir($directory) || !is_readable($directory))
-            throw new InvalidArgumentException($directory.' is not a valid directory to archive');
+        if (!is_dir($directory) || !is_readable($directory)) {
+                    throw new InvalidArgumentException($directory.' is not a valid directory to archive');
+        }
 
         return static::archiveFiles($directory, $archiveName, $compressionLevel, $password) > 0;
     }
@@ -594,9 +605,9 @@ 
         if (is_array($nodes)) {
             foreach ($nodes as $destination => $source) {
                 // new format
-                if (is_numeric($destination))
-                    $destination = $source;
-                else {
+                if (is_numeric($destination)) {
+                                    $destination = $source;
+                } else {
                     // old format
                     if (!file_exists($source)) {
                         list($destination, $source) = [$source, $destination];
@@ -606,20 +617,22 @@ 
                 $destination = rtrim($destination, '/\\*');
 
                 // if is directory
-                if (is_dir($source))
-                    static::importFilesFromDir(rtrim($source, '/\\*').'/*',
+                if (is_dir($source)) {
+                                    static::importFilesFromDir(rtrim($source, '/\\*').'/*',
                         !empty($destination) ? $destination.'/' : null, true, $files);
-                else if (is_file($source))
-                    $files[$destination] = $source;
+                } else if (is_file($source)) {
+                                    $files[$destination] = $source;
+                }
             }
 
         } else if (is_string($nodes)) { // passed one file or directory
             // if is directory
-            if (is_dir($nodes))
-                static::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
+            if (is_dir($nodes)) {
+                            static::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
                     $files);
-            else if (is_file($nodes))
-                $files[basename($nodes)] = $nodes;
+            } else if (is_file($nodes)) {
+                            $files[basename($nodes)] = $nodes;
+            }
         }
 
         return $files;
@@ -636,8 +649,9 @@ 
         // $map[$destination] = rtrim($source, '/*');
         // do not map root archive folder
 
-        if ($destination !== null)
-            $map[$destination] = null;
+        if ($destination !== null) {
+                    $map[$destination] = null;
+        }
 
         foreach (glob($source, GLOB_MARK) as $node) {
             if (in_array(substr($node, -1), ['/', '\\'], true) && $recursive) {

src/CamApplication.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
     public function checkFormats()
     {
         echo "format\topen\tstream\tcreate\tappend\tupdate\tencrypt\tdrivers".PHP_EOL;
-        foreach(Formats::getFormatsReport() as $format => $config) {
+        foreach (Formats::getFormatsReport() as $format => $config) {
             echo $format."\t"
                 .($config['open'] ? '+' : '-')."\t"
                 .($config['stream'] ? '+' : '-')."\t"
@@ -55,7 +55,7 @@ 
             if (!empty($install)) {
                 $notInstalled[] = [$driverClass, $description, $install];
             } else {
-                echo ($i++) . '. ' . $driverClass . ' - ' . $description . PHP_EOL;
+                echo ($i++).'. '.$driverClass.' - '.$description.PHP_EOL;
             }
         }
 
@@ -63,8 +63,8 @@ 
             echo PHP_EOL.'Not installed:'.PHP_EOL;
             $i = 1;
             foreach ($notInstalled as $data) {
-                echo ($i++) . '. ' . $data[0] . ' - ' . $data[1] . PHP_EOL
-                    . '- ' . $data[2] . PHP_EOL.PHP_EOL;
+                echo ($i++).'. '.$data[0].' - '.$data[1].PHP_EOL
+                    . '- '.$data[2].PHP_EOL.PHP_EOL;
             }
         }
     }
@@ -100,7 +100,7 @@ 
         echo str_repeat('-', $width).PHP_EOL;
         foreach ($archive->getFileNames($filter) as $file) {
             $info = $archive->getFileData($file);
-            $file_name = strlen($file) > $name_width ? substr($file, 0, $name_width-2).'..' : $file;
+            $file_name = strlen($file) > $name_width ? substr($file, 0, $name_width - 2).'..' : $file;
             echo sprintf('%-'.$name_width.'s | %8s | %8s | %18s'.PHP_EOL,
                 $file_name,
                 implode(null, $this->formatSize($info->compressedSize, 3)),
@@ -307,7 +307,7 @@ 
         else {
             $size = $this->formatSize($len);
             echo sprintf('Added %s(%1.1f%s) file to %s',
-                    $args['FILE_IN_ARCHIVE'], $size[0], $size[1], $args['ARCHIVE']) . PHP_EOL;
+                    $args['FILE_IN_ARCHIVE'], $size[0], $size[1], $args['ARCHIVE']).PHP_EOL;
         }
     }
 
@@ -347,7 +347,7 @@ 
                     $archive = UnifiedArchive::open($args['ARCHIVE']);
                     $archive->setComment($args['--comment']);
                 }
-                echo 'Created archive ' . $args['ARCHIVE'] . ' with ' . $archived_files . ' file(s) of total size ' . implode('', $this->formatSize(filesize($args['ARCHIVE']))) . PHP_EOL;
+                echo 'Created archive '.$args['ARCHIVE'].' with '.$archived_files.' file(s) of total size '.implode('', $this->formatSize(filesize($args['ARCHIVE']))).PHP_EOL;
             }
         }
     }

Braces +64 added lines, -44 removed lines

@@ -15,12 +15,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;
     }
@@ -145,17 +147,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, G:m');
-            else
-                return $datetime->format('d M Y, G:m');
+            if ($datetime->format('Y') == date('Y')) {
+                            return $datetime->format('d M, G:m');
+            } else {
+                            return $datetime->format('d M Y, G:m');
+            }
         }
     }
 
@@ -173,8 +176,9 @@ 
         echo 'Archive   compressed size: '.implode(' ', $this->formatSize($archive->getCompressedSize(), 2)).PHP_EOL;
         echo 'Archive uncompressed size: '.implode(' ', $this->formatSize($archive->getOriginalSize(), 2)).PHP_EOL;
         echo 'Archive compression ratio: '.round($archive->getOriginalSize() / $archive->getCompressedSize(), 6).'/1 ('.floor($archive->getCompressedSize() / $archive->getOriginalSize() * 100).'%)'.PHP_EOL;
-        if (($comment = $archive->getComment()) !== null)
-            echo 'Archive           comment: '.$comment.PHP_EOL;
+        if (($comment = $archive->getComment()) !== null) {
+                    echo 'Archive           comment: '.$comment.PHP_EOL;
+        }
     }
 
     /**
@@ -187,25 +191,36 @@ 
         $archive = $this->open($args['ARCHIVE'], isset($args['--password']) ? $args['--password'] : null);
         $output = getcwd();
         if (isset($args['--output'])) {
-            if (!is_dir($args['--output']))
-                mkdir($args['--output']);
+            if (!is_dir($args['--output'])) {
+                            mkdir($args['--output']);
+            }
             $output = realpath($args['--output']);
         }
 
         if (empty($args['FILES_IN_ARCHIVE']) || $args['FILES_IN_ARCHIVE'] == array('/') || $args['FILES_IN_ARCHIVE'] == array('*')) {
             $result = $archive->extractFiles($output);
-            if ($result === false) echo 'Error occured'.PHP_EOL;
-            else echo 'Extracted '.$result.' file(s) to '.$output.PHP_EOL;
+            if ($result === false) {
+             echo 'Error occured'.PHP_EOL;
+            } else {
+             echo 'Extracted '.$result.' file(s) to '.$output.PHP_EOL;
+            }
         } else {
             $extracted = 0;
             $errored = [];
             foreach ($args['FILES_IN_ARCHIVE'] as $file) {
                 $result = $archive->extractFiles($output, $file);
-                if ($result === false) $errored[] = $file;
-                else $extracted += $result;
+                if ($result === false) {
+                 $errored[] = $file;
+                } else {
+                 $extracted += $result;
+                }
+            }
+            if (!empty($errored)) {
+             echo 'Errored: '.implode(', ', $errored).PHP_EOL;
+            }
+            if ($extracted > 0) {
+             echo 'Extracted '.$extracted.' file(s) to '.$output.PHP_EOL;
             }
-            if (!empty($errored)) echo 'Errored: '.implode(', ', $errored).PHP_EOL;
-            if ($extracted > 0) echo 'Extracted '.$extracted.' file(s) to '.$output.PHP_EOL;
         }
     }
 
@@ -248,8 +263,9 @@ 
             echo 'Is compressed    : '.($info->isCompressed ? 'yes' : 'no').PHP_EOL;
             echo 'Date modification: '.$this->formatDate($info->modificationTime).PHP_EOL;
             $comment = $info->comment;
-            if ($comment !== null)
-                echo 'Comment: '.$comment.PHP_EOL;
+            if ($comment !== null) {
+                            echo 'Comment: '.$comment.PHP_EOL;
+            }
         }
     }
 
@@ -267,8 +283,9 @@ 
                 echo 'File '.$file.' is NOT in archive'.PHP_EOL;
                 continue;
             }
-            if ($archive->deleteFiles($file) === false)
-                echo 'Error file '.$file.PHP_EOL;
+            if ($archive->deleteFiles($file) === false) {
+                            echo 'Error file '.$file.PHP_EOL;
+            }
         }
     }
 
@@ -281,10 +298,11 @@ 
     {
         $archive = $this->open($args['ARCHIVE']);
         $added_files = $archive->addFiles($args['FILES_ON_DISK']);
-        if ($added_files === false)
-            echo 'Error'.PHP_EOL;
-        else
-            echo 'Added '.$added_files.' file(s)'.PHP_EOL;
+        if ($added_files === false) {
+                    echo 'Error'.PHP_EOL;
+        } else {
+                    echo 'Added '.$added_files.' file(s)'.PHP_EOL;
+        }
     }
 
     /**
@@ -302,9 +320,9 @@ 
         $len = strlen($content);
 
         $added_files = $archive->addFileFromString($args['FILE_IN_ARCHIVE'], $content);
-        if ($added_files === false)
-            echo 'Error'.PHP_EOL;
-        else {
+        if ($added_files === false) {
+                    echo 'Error'.PHP_EOL;
+        } else {
             $size = $this->formatSize($len);
             echo sprintf('Added %s(%1.1f%s) file to %s',
                     $args['FILE_IN_ARCHIVE'], $size[0], $size[1], $args['ARCHIVE']) . PHP_EOL;
@@ -321,9 +339,9 @@ 
         $compression_level = isset($args['--compressionLevel']) ? $args['--compressionLevel'] : BasicDriver::COMPRESSION_AVERAGE;
 
         if (file_exists($args['ARCHIVE'])) {
-            if (is_dir($args['ARCHIVE']))
-                echo $args['ARCHIVE'].' is a directory!'.PHP_EOL;
-            else {
+            if (is_dir($args['ARCHIVE'])) {
+                            echo $args['ARCHIVE'].' is a directory!'.PHP_EOL;
+            } else {
                 echo 'File '.$args['ARCHIVE'].' already exists!'.PHP_EOL;
             }
         } else {
@@ -340,9 +358,9 @@ 
             }
 
             $archived_files = UnifiedArchive::archiveFiles($files, $args['ARCHIVE'], $compression_level, $password);
-            if ($archived_files === false)
-                echo 'Error'.PHP_EOL;
-            else {
+            if ($archived_files === false) {
+                            echo 'Error'.PHP_EOL;
+            } else {
                 if (isset($args['--comment'])) {
                     $archive = UnifiedArchive::open($args['ARCHIVE']);
                     $archive->setComment($args['--comment']);
@@ -377,12 +395,14 @@ 
 
         if (function_exists('shell_exec')) {
             // try for bash
-            if (is_numeric($bash_width = trim(shell_exec('tput cols'))))
-                return $bash_width;
+            if (is_numeric($bash_width = trim(shell_exec('tput cols')))) {
+                            return $bash_width;
+            }
 
             // try for windows
-            if (!empty($win_width_val = trim(shell_exec('mode con'))) && preg_match('~columns: (\d+)~i', $win_width_val, $win_width))
-                return $win_width[1];
+            if (!empty($win_width_val = trim(shell_exec('mode con'))) && preg_match('~columns: (\d+)~i', $win_width_val, $win_width)) {
+                            return $win_width[1];
+            }
         }
 
         return 80;