wapmorgan / UnifiedArchive

src/Commands/DriversCommand.php

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
             if (!empty($install)) {
                 $notInstalled[] = [$driverClass, $description, $install];
             } else {
-                $output->writeln($formatter->formatSection($driverClass, $description) . ': ' . implode(', ', $driverClass::getSupportedFormats()));
+                $output->writeln($formatter->formatSection($driverClass, $description).': '.implode(', ', $driverClass::getSupportedFormats()));
             }
         }
 
         if (!empty($notInstalled)) {
             foreach ($notInstalled as $data) {
-                $output->writeln($formatter->formatSection($data[0], $data[1] . ': ' . implode(', ', $data[0]::getSupportedFormats()), 'error'));
+                $output->writeln($formatter->formatSection($data[0], $data[1].': '.implode(', ', $data[0]::getSupportedFormats()), 'error'));
                 $data[2] = preg_replace('~`(.+?)`~', '<options=bold,underscore>$1</>', $data[2]);
                 $output->writeln($formatter->formatSection($data[0], $data[2], 'comment'));
             }

src/Drivers/TarByPear.php

Spacing +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
     public static function getInstallationInstruction()
     {
         return !class_exists('\Archive_Tar')
-            ? 'install library [pear/archive_tar]: `composer require pear/archive_tar`' . "\n"  . ' and optionally php-extensions (zlib, bzip2)'
+            ? 'install library [pear/archive_tar]: `composer require pear/archive_tar`'."\n".' and optionally php-extensions (zlib, bzip2)'
             : null;
     }
 
@@ -136,7 +136,7 @@ 
                 $compression = 'lzma2';
                 break;
             case 'z':
-                $tar_aname = 'compress.lzw://' . $archiveFileName;
+                $tar_aname = 'compress.lzw://'.$archiveFileName;
                 break;
         }
 
@@ -193,7 +193,7 @@ 
 
             case Formats::TAR_LZW:
                 LzwStreamWrapper::registerWrapper();
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->archiveFileName);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->archiveFileName);
                 break;
 
             default:

Braces +26 added lines, -18 removed lines

@@ -165,10 +165,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);
@@ -177,11 +178,13 @@ 
             $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');
+                }
             }
             if ($fileProgressCallable !== null) {
                 call_user_func_array($fileProgressCallable, [$current_file++, $total_files, $filename, $localName]);
@@ -242,8 +245,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;
@@ -289,14 +293,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);
@@ -311,8 +317,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);
     }
@@ -322,8 +329,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/AlchemyZippy.php

Spacing +7 added lines, -7 removed lines

@@ -102,9 +102,9 @@ 
     {
         self::init();
         return static::$zippy === false
-            ? '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**: `composer require symfony/process:~3.4`, because they require different `symfony/process` versions.' . "\n" .
+            ? '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**: `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`'
             : null;
     }
@@ -207,8 +207,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;
     }
@@ -257,7 +257,7 @@ 
     public function getFileContent($fileName)
     {
         $member = $this->getMember($fileName);
-        return (string)$member;
+        return (string) $member;
     }
 
     /**
@@ -266,7 +266,7 @@ 
     public function getFileStream($fileName)
     {
         $member = $this->getMember($fileName);
-        return self::wrapStringInStream((string)$member);
+        return self::wrapStringInStream((string) $member);
     }
 
     /**

Braces +11 added lines, -8 removed lines

@@ -61,10 +61,11 @@ 
 
     protected static function init()
     {
-        if (!class_exists('\Alchemy\Zippy\Zippy'))
-            static::$zippy = false;
-        else if (static::$zippy === null)
-            static::$zippy = Zippy::load();
+        if (!class_exists('\Alchemy\Zippy\Zippy')) {
+                    static::$zippy = false;
+        } else if (static::$zippy === null) {
+                    static::$zippy = Zippy::load();
+        }
     }
 
     /**
@@ -75,8 +76,9 @@ 
     {
         static::init();
 
-        if (static::$zippy === false)
-            return [];
+        if (static::$zippy === false) {
+                    return [];
+        }
 
         switch ($format) {
             case Formats::TAR_BZIP:
@@ -212,8 +214,9 @@ 
         $information = new ArchiveInformation();
 
         foreach ($this->archive->getMembers() as $member) {
-            if ($member->isDir())
-                continue;
+            if ($member->isDir()) {
+                            continue;
+            }
 
             $this->files[] = $information->files[] = str_replace('\\', '/', $member->getLocation());
             $this->members[str_replace('\\', '/', $member->getLocation())] = $member;

src/Drivers/OneFile/Lzma.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
  */
 class Lzma extends OneFileDriver
 {
-    const FORMAT_SUFFIX =  'xz';
+    const FORMAT_SUFFIX = 'xz';
 
     /**
      * @return array
@@ -50,7 +50,7 @@ 
     public static function getInstallationInstruction()
     {
         return !extension_loaded('xz')
-            ? 'install [xz] extension' . "\n" . 'For 5.x: https://github.com/payden/php-xz' . "\n" . 'For 7.x: https://github.com/codemasher/php-ext-xz'
+            ? 'install [xz] extension'."\n".'For 5.x: https://github.com/payden/php-xz'."\n".'For 7.x: https://github.com/codemasher/php-ext-xz'
             : null;
     }
 

src/PclZipInterface.php

Spacing +19 added lines, -19 removed lines

@@ -272,7 +272,7 @@ 
 
         $report = array();
         foreach ($this->listContent() as $file_header) {
-            $file_header = (object)$file_header;
+            $file_header = (object) $file_header;
             // add file information to report
             $report[] = $file_header;
             // refuse by select rule
@@ -406,7 +406,7 @@ 
         }
 
         foreach ($report as $i => $reportItem) {
-            $report[$i] = (array)$reportItem;
+            $report[$i] = (array) $reportItem;
         }
 
         return $report;
@@ -457,7 +457,7 @@ 
 
         $report = [];
         foreach ($this->listContent() as $file_header) {
-            $file_header = (object)$file_header;
+            $file_header = (object) $file_header;
             // select by select rule
             if (call_user_func($selectFilter, $file_header->stored_filename,
                     $file_header->filename, $file_header->index)
@@ -477,7 +477,7 @@ 
         }
 
         foreach ($report as $i => $reportItem) {
-            $report[$i] = (array)$reportItem;
+            $report[$i] = (array) $reportItem;
         }
 
         return $report;
@@ -539,7 +539,7 @@ 
             }
         }
 
-        call_user_func(function ($directory) {
+        call_user_func(function($directory) {
             foreach (glob($directory.'/*') as $f) {
                 if (is_dir($f)) call_user_func(__FUNCTION__, $f);
                 else unlink($f);
@@ -568,16 +568,16 @@ 
         $filters = array();
         if (isset($options[PCLZIP_OPT_REMOVE_PATH])
             && !isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            $filters[] = function(&$key, &$value) use ($options) {
                 $key = str_replace($key, null, $key);
             };
         if (isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) {
+            $filters[] = function(&$key, &$value) {
                 $key = basename($key);
             };
         if (isset($options[PCLZIP_OPT_ADD_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
-                $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/') . '/' .
+            $filters[] = function(&$key, &$value) use ($options) {
+                $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/').'/'.
                     ltrim($key, '/');
             };
         return $filters;
@@ -591,7 +591,7 @@ 
      */
     private function extractCallbacks(array $options, $preCallbackConst, $postCallbackConst)
     {
-        $preCallback = $postCallback = function () { return true; };
+        $preCallback = $postCallback = function() { return true; };
 
         if (isset($options[$preCallbackConst]) && is_callable($options[$preCallbackConst]))
             $preCallback = $options[$preCallbackConst];
@@ -608,8 +608,8 @@ 
      */
     private function makeKeyValueArrayFromList(array $options)
     {
-        $keys = array_filter($options, function ($v) {return ($v%2) == 0;}, ARRAY_FILTER_USE_KEY);
-        $values = array_filter($options, function ($v) {return ($v%2) == 1;}, ARRAY_FILTER_USE_KEY);
+        $keys = array_filter($options, function($v) {return ($v % 2) == 0; }, ARRAY_FILTER_USE_KEY);
+        $values = array_filter($options, function($v) {return ($v % 2) == 1; }, ARRAY_FILTER_USE_KEY);
         if (count($values) < count($keys)) $values[] = true;
         return array_combine($keys, $values);
     }
@@ -658,7 +658,7 @@ 
                 range($parts[0], $parts[1]), $allowedIndexes);
         }
 
-        return function ($key, $value, $index) use ($allowedIndexes) {
+        return function($key, $value, $index) use ($allowedIndexes) {
             return in_array($index, $allowedIndexes)
                 ? self::SELECT_FILTER_PASS
                 : self::SELECT_FILTER_REFUSE;
@@ -675,7 +675,7 @@ 
             ? $names
             : explode(',', $names);
 
-        return function ($key, $value) use ($allowedNames) {
+        return function($key, $value) use ($allowedNames) {
             foreach ($allowedNames as $name) {
                 // select directory with nested files
                 if (in_array(substr($name, -1), ['/', '\\'])) {
@@ -703,7 +703,7 @@ 
      */
     protected function createByEregSelector($regex)
     {
-        return function ($key, $value) use ($regex) {
+        return function($key, $value) use ($regex) {
             return (ereg($regex, $key) !== false)
                 ? self::SELECT_FILTER_PASS
                 : self::SELECT_FILTER_REFUSE;
@@ -716,7 +716,7 @@ 
      */
     protected function createByPregSelector($regex)
     {
-        return function ($key, $value) use ($regex) {
+        return function($key, $value) use ($regex) {
             return preg_match($regex, $key)
                 ? self::SELECT_FILTER_PASS
                 : self::SELECT_FILTER_REFUSE;
@@ -743,7 +743,7 @@ 
             $selectFilter = $this->createByIndexSelector($options[PCLZIP_OPT_BY_INDEX]);
         // no rule
         else
-            $selectFilter = function () {
+            $selectFilter = function() {
                 return self::SELECT_FILTER_PASS;
             };
         return $selectFilter;
@@ -783,9 +783,9 @@ 
         if (isset($options[PCLZIP_OPT_COMMENT]))
             $comment = $options[PCLZIP_OPT_COMMENT];
         else if (isset($options[PCLZIP_OPT_ADD_COMMENT])) {;
-            $comment = $currentComment . $options[PCLZIP_OPT_ADD_COMMENT];
+            $comment = $currentComment.$options[PCLZIP_OPT_ADD_COMMENT];
         } else if (isset($options[PCLZIP_OPT_PREPEND_COMMENT])) {
-            $comment = $options[PCLZIP_OPT_PREPEND_COMMENT] . $currentComment;
+            $comment = $options[PCLZIP_OPT_PREPEND_COMMENT].$currentComment;
         }
         return $comment;
     }

Braces +99 added lines, -57 removed lines

@@ -137,8 +137,11 @@ 
      */
     public function create($content)
     {
-        if (is_array($content)) $paths_list = $content;
-        else $paths_list = explode(',', $content);
+        if (is_array($content)) {
+         $paths_list = $content;
+        } else {
+         $paths_list = explode(',', $content);
+        }
 
         $options = $this->makeOptionsFromArguments(func_get_args());
 
@@ -146,8 +149,9 @@ 
         $filters = $this->createFilters($options);
         list($preAddCallback, $postAddCallback) = $this->extractCallbacks($options, PCLZIP_CB_PRE_ADD, PCLZIP_CB_POST_ADD);
 
-        if (!empty($comment = $this->buildComment($options, null)))
-            $this->archive->setComment($comment);
+        if (!empty($comment = $this->buildComment($options, null))) {
+                    $this->archive->setComment($comment);
+        }
 
         // scan filesystem for files list
         return $this->addSnippets($paths_list, $filters, $preAddCallback, $postAddCallback);
@@ -167,16 +171,18 @@ 
             $localname = $fileToAdd;
             $filename = $fileToAdd;
 
-            foreach ($filters as $filter)
-                call_user_func($filter, $localname, $filename);
+            foreach ($filters as $filter) {
+                            call_user_func($filter, $localname, $filename);
+            }
 
             $file_header = $this->createFileHeader($localname, $filename);
             if (call_user_func($preAddCallback, $file_header) == 1) {
                 //
                 // Check for max length > 255
                 //
-                if (strlen(basename($file_header->stored_filename)) > 255)
-                    $file_header->status = 'filename_too_long';
+                if (strlen(basename($file_header->stored_filename)) > 255) {
+                                    $file_header->status = 'filename_too_long';
+                }
                 if (is_file($filename)) {
                     $this->archive->addFiles([
                         $file_header->stored_filename => $file_header->filename,
@@ -248,27 +254,35 @@ 
         }
 
         // filters initiation
-        if (isset($options[PCLZIP_OPT_PATH]))
-            $extractPath = rtrim($options[PCLZIP_OPT_PATH], '/');
-        else $extractPath = rtrim(getcwd(), '/');
+        if (isset($options[PCLZIP_OPT_PATH])) {
+                    $extractPath = rtrim($options[PCLZIP_OPT_PATH], '/');
+        } else {
+         $extractPath = rtrim(getcwd(), '/');
+        }
 
         $filters = $this->createFilters($options);
         list($preExtractCallback, $postExtractCallback) = $this->extractCallbacks($options, PCLZIP_CB_PRE_EXTRACT, PCLZIP_CB_POST_EXTRACT);
         $selectFilter = $this->createSelector($options);
 
-        if (isset($options[PCLZIP_OPT_EXTRACT_AS_STRING]))
-            $anotherOutputFormat = PCLZIP_OPT_EXTRACT_AS_STRING;
-        else if (isset($options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-            $anotherOutputFormat = PCLZIP_OPT_EXTRACT_IN_OUTPUT;
-        else $anotherOutputFormat = false;
+        if (isset($options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+                    $anotherOutputFormat = PCLZIP_OPT_EXTRACT_AS_STRING;
+        } else if (isset($options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+                    $anotherOutputFormat = PCLZIP_OPT_EXTRACT_IN_OUTPUT;
+        } else {
+         $anotherOutputFormat = false;
+        }
 
-        if (isset($options[PCLZIP_OPT_REPLACE_NEWER]))
-            $doNotReplaceNewer = false;
-        else $doNotReplaceNewer = true;
+        if (isset($options[PCLZIP_OPT_REPLACE_NEWER])) {
+                    $doNotReplaceNewer = false;
+        } else {
+         $doNotReplaceNewer = true;
+        }
 
-        if (isset($options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION]))
-            $restrictExtractDir = $options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION];
-        else $restrictExtractDir = false;
+        if (isset($options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+                    $restrictExtractDir = $options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION];
+        } else {
+         $restrictExtractDir = false;
+        }
 
         $report = array();
         foreach ($this->listContent() as $file_header) {
@@ -339,8 +353,10 @@ 
             // extract content
             else if ($anotherOutputFormat === false) {
                 // apply path filters
-                foreach ($filters as $filter) call_user_func($filter,
+                foreach ($filters as $filter) {
+                 call_user_func($filter,
                     $file_header->stored_filename, $file_header->filename);
+                }
                 // dir extraction process
                 if ($file_header->folder) {
                     // if dir doesn't exist
@@ -431,15 +447,19 @@ 
      */
     public function add($content)
     {
-        if (is_array($content)) $paths_list = $content;
-        else $paths_list = explode(',', $content);
+        if (is_array($content)) {
+         $paths_list = $content;
+        } else {
+         $paths_list = explode(',', $content);
+        }
 
         $options = $this->makeOptionsFromArguments(func_get_args());
         $filters = $this->createFilters($options);
         list($preAddCallback, $postAddCallback) = $this->extractCallbacks($options, PCLZIP_CB_PRE_ADD, PCLZIP_CB_POST_ADD);
 
-        if (!empty($comment = $this->buildComment($options, $this->archive->getComment())))
-            $this->archive->setComment($comment);
+        if (!empty($comment = $this->buildComment($options, $this->archive->getComment()))) {
+                    $this->archive->setComment($comment);
+        }
 
         // scan filesystem for files list
         return $this->addSnippets($paths_list, $filters, $preAddCallback, $postAddCallback);
@@ -511,8 +531,12 @@ 
         }
 
         $tempDir = tempnam(PCLZIP_TEMPORARY_DIR, 'merging');
-        if (file_exists($tempDir)) unlink($tempDir);
-        if (!mkdir($tempDir)) return 0;
+        if (file_exists($tempDir)) {
+         unlink($tempDir);
+        }
+        if (!mkdir($tempDir)) {
+         return 0;
+        }
 
         // go through archive content list and copy all files
         foreach ($a->getFileNames() as $filename) {
@@ -541,8 +565,11 @@ 
 
         call_user_func(function ($directory) {
             foreach (glob($directory.'/*') as $f) {
-                if (is_dir($f)) call_user_func(__FUNCTION__, $f);
-                else unlink($f);
+                if (is_dir($f)) {
+                 call_user_func(__FUNCTION__, $f);
+                } else {
+                 unlink($f);
+                }
             }
         }, $tempDir);
 
@@ -567,18 +594,21 @@ 
     {
         $filters = array();
         if (isset($options[PCLZIP_OPT_REMOVE_PATH])
-            && !isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            && !isset($options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $filters[] = function (&$key, &$value) use ($options) {
                 $key = str_replace($key, null, $key);
+        }
             };
-        if (isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) {
+        if (isset($options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+                    $filters[] = function (&$key, &$value) {
                 $key = basename($key);
+        }
             };
-        if (isset($options[PCLZIP_OPT_ADD_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+        if (isset($options[PCLZIP_OPT_ADD_PATH])) {
+                    $filters[] = function (&$key, &$value) use ($options) {
                 $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/') . '/' .
                     ltrim($key, '/');
+        }
             };
         return $filters;
     }
@@ -593,11 +623,13 @@ 
     {
         $preCallback = $postCallback = function () { return true; };
 
-        if (isset($options[$preCallbackConst]) && is_callable($options[$preCallbackConst]))
-            $preCallback = $options[$preCallbackConst];
+        if (isset($options[$preCallbackConst]) && is_callable($options[$preCallbackConst])) {
+                    $preCallback = $options[$preCallbackConst];
+        }
 
-        if (isset($options[$postCallbackConst]) && is_callable($options[$postCallbackConst]))
-            $postCallback = $options[$postCallbackConst];
+        if (isset($options[$postCallbackConst]) && is_callable($options[$postCallbackConst])) {
+                    $postCallback = $options[$postCallbackConst];
+        }
 
         return [$preCallback, $postCallback];
     }
@@ -610,7 +642,9 @@ 
     {
         $keys = array_filter($options, function ($v) {return ($v%2) == 0;}, ARRAY_FILTER_USE_KEY);
         $values = array_filter($options, function ($v) {return ($v%2) == 1;}, ARRAY_FILTER_USE_KEY);
-        if (count($values) < count($keys)) $values[] = true;
+        if (count($values) < count($keys)) {
+         $values[] = true;
+        }
         return array_combine($keys, $values);
     }
 
@@ -653,9 +687,12 @@ 
         $allowedIndexes = array();
         foreach ($indexes as $rule) {
             $parts = explode('-', $rule);
-            if (count($parts) == 1) $allowedIndexes[] = $rule;
-            else $allowedIndexes = array_merge(
+            if (count($parts) == 1) {
+             $allowedIndexes[] = $rule;
+            } else {
+             $allowedIndexes = array_merge(
                 range($parts[0], $parts[1]), $allowedIndexes);
+            }
         }
 
         return function ($key, $value, $index) use ($allowedIndexes) {
@@ -730,21 +767,26 @@ 
     protected function createSelector(array $options)
     {
         // exact matching
-        if (isset($options[PCLZIP_OPT_BY_NAME]))
-            $selectFilter = $this->createByNameSelector($options[PCLZIP_OPT_BY_NAME]);
+        if (isset($options[PCLZIP_OPT_BY_NAME])) {
+                    $selectFilter = $this->createByNameSelector($options[PCLZIP_OPT_BY_NAME]);
+        }
         // <ereg> rule
-        else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg'))
-            $selectFilter = $this->createByEregSelector($options[PCLZIP_OPT_BY_EREG]);
+        else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg')) {
+                    $selectFilter = $this->createByEregSelector($options[PCLZIP_OPT_BY_EREG]);
+        }
         // <preg_match> rule
-        else if (isset($options[PCLZIP_OPT_BY_PREG]))
-            $selectFilter = $this->createByPregSelector($options[PCLZIP_OPT_BY_PREG]);
+        else if (isset($options[PCLZIP_OPT_BY_PREG])) {
+                    $selectFilter = $this->createByPregSelector($options[PCLZIP_OPT_BY_PREG]);
+        }
         // index rule
-        else if (isset($options[PCLZIP_OPT_BY_INDEX]))
-            $selectFilter = $this->createByIndexSelector($options[PCLZIP_OPT_BY_INDEX]);
+        else if (isset($options[PCLZIP_OPT_BY_INDEX])) {
+                    $selectFilter = $this->createByIndexSelector($options[PCLZIP_OPT_BY_INDEX]);
+        }
         // no rule
-        else
-            $selectFilter = function () {
+        else {
+                    $selectFilter = function () {
                 return self::SELECT_FILTER_PASS;
+        }
             };
         return $selectFilter;
     }
@@ -780,9 +822,9 @@ 
     protected function buildComment(array $options, $currentComment)
     {
         $comment = null;
-        if (isset($options[PCLZIP_OPT_COMMENT]))
-            $comment = $options[PCLZIP_OPT_COMMENT];
-        else if (isset($options[PCLZIP_OPT_ADD_COMMENT])) {;
+        if (isset($options[PCLZIP_OPT_COMMENT])) {
+                    $comment = $options[PCLZIP_OPT_COMMENT];
+        } else if (isset($options[PCLZIP_OPT_ADD_COMMENT])) {;
             $comment = $currentComment . $options[PCLZIP_OPT_ADD_COMMENT];
         } else if (isset($options[PCLZIP_OPT_PREPEND_COMMENT])) {
             $comment = $options[PCLZIP_OPT_PREPEND_COMMENT] . $currentComment;

src/Commands/ExtractArchiveCommand.php

Spacing +2 added lines, -2 removed lines

@@ -31,11 +31,11 @@
         $archive = $this->getArchive($input, $output);
 
         if (disk_free_space($output_dir) < $archive->getOriginalSize()) {
-            throw new \LogicException('Archive size ' . implode($this->formatSize($archive->getOriginalSize())) . ' is more that available on disk '
+            throw new \LogicException('Archive size '.implode($this->formatSize($archive->getOriginalSize())).' is more that available on disk '
                                       . implode($this->formatSize(disk_free_space($output_dir))));
         }
         $archive->extractFiles($output_dir, $entry_selector, true);
-        $output->writeln('<info>Extracted all archive contents (' . implode($this->formatSize($archive->getOriginalSize())) . ')</info>');
+        $output->writeln('<info>Extracted all archive contents ('.implode($this->formatSize($archive->getOriginalSize())).')</info>');
 
         return 0;
     }

src/Commands/InfoCommand.php

Spacing +7 added lines, -7 removed lines

@@ -26,15 +26,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 (!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

@@ -33,8 +33,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 (!empty($comment = $archive->getComment()))
-            $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        if (!empty($comment = $archive->getComment())) {
+                    $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        }
 
         return 0;
     }

src/Commands/ExtractFilesCommand.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $entry_selector = $input->getArgument('entrySelector');
 
         $archive->extractFiles($output_dir, $entry_selector, true);
-        $output->writeln('<info>Extracted:</info> ' . implode(', ', $entry_selector) . ' (' . count($entry_selector) . ') file(s)');
+        $output->writeln('<info>Extracted:</info> '.implode(', ', $entry_selector).' ('.count($entry_selector).') file(s)');
 
         return 0;
     }

src/Commands/DeleteFileCommand.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         list($archive, $file) = $this->getArchiveAndFile($input, $output);
 
         $archive->deleteFiles($file);
-        $output->writeln('<comment>- file "' . $file . '"</comment>');
+        $output->writeln('<comment>- file "'.$file.'"</comment>');
 
         return 0;
     }