wapmorgan / UnifiedArchive

src/Commands/BaseCommand.php

Braces +16 added lines, -13 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;
     }
@@ -33,17 +35,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');
+            }
         }
     }
 

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] !== '\\') {

src/Commands/BaseFileCommand.php

Spacing +2 added lines, -2 removed lines

@@ -37,9 +37,9 @@
             $question = new ChoiceQuestion('Which file', $files);
             $file = $helper->ask($input, $output, $question);
         } else if (!in_array($file, $files, true)) {
-            throw new \InvalidArgumentException('File "' . $file . '" not found in archive');
+            throw new \InvalidArgumentException('File "'.$file.'" not found in archive');
         }
-        $output->writeln('<comment>Selecting file ' . $file . '</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
+        $output->writeln('<comment>Selecting file '.$file.'</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
 
         return [$archive, $file];
     }

src/Commands/BaseArchiveCommand.php

Spacing +6 added lines, -6 removed lines

@@ -29,20 +29,20 @@
     protected function getArchive(InputInterface $input, OutputInterface $output)
     {
         $file = realpath($input->getArgument('archive'));
-        $output->writeln('<comment>Opening ' . $file . '</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
+        $output->writeln('<comment>Opening '.$file.'</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
         if (!is_file($file)) {
-            throw new \InvalidArgumentException('File ' . $input->getArgument('archive') . ' is not accessible');
+            throw new \InvalidArgumentException('File '.$input->getArgument('archive').' is not accessible');
         }
-        $output->writeln('<comment>Format ' . Formats::detectArchiveFormat($file).'</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
+        $output->writeln('<comment>Format '.Formats::detectArchiveFormat($file).'</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
         $password = $input->getOption('password');
         if (empty($password)) {
             $password = null;
         } else {
-            $output->writeln('<comment>Passing password: ' . strlen($password).'</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
+            $output->writeln('<comment>Passing password: '.strlen($password).'</comment>', OutputInterface::VERBOSITY_VERY_VERBOSE);
         }
         $archive = $this->open($file, $password);
-        $output->writeln('<comment>Driver ' . $archive->getDriverType() . '</comment>', OutputInterface::VERBOSITY_VERBOSE);
-        $output->writeln('<comment>Driver abilities: ' . implode(', ', $this->getDriverFormatAbilities($archive->getDriverType(), $archive->getFormat())) . '</comment>', OutputInterface::VERBOSITY_VERBOSE);
+        $output->writeln('<comment>Driver '.$archive->getDriverType().'</comment>', OutputInterface::VERBOSITY_VERBOSE);
+        $output->writeln('<comment>Driver abilities: '.implode(', ', $this->getDriverFormatAbilities($archive->getDriverType(), $archive->getFormat())).'</comment>', OutputInterface::VERBOSITY_VERBOSE);
         return $archive;
     }
 

src/Commands/CreateCommand.php

Braces +3 added lines, -3 removed lines

@@ -58,9 +58,9 @@
         $comment = $input->getOption('comment');
 
         if (file_exists($archive_file)) {
-            if (is_dir($archive_file))
-                throw new \InvalidArgumentException($archive_file . ' is a directory!');
-            else {
+            if (is_dir($archive_file)) {
+                            throw new \InvalidArgumentException($archive_file . ' is a directory!');
+            } else {
                 throw new \InvalidArgumentException('File "' . $archive_file . '" already exists!');
             }
         }

Spacing +16 added lines, -16 removed lines

@@ -47,7 +47,7 @@ 
         $password = $input->getOption('password');
         $compression = $input->getOption('compression');
         if (!isset(static::$compressionLevels[$compression])) {
-            throw new \InvalidArgumentException('Compression "' . $compression . '" is not valid');
+            throw new \InvalidArgumentException('Compression "'.$compression.'" is not valid');
         }
         $compression = static::$compressionLevels[$compression];
         $path = $input->getOption('path');
@@ -59,9 +59,9 @@ 
 
         if (file_exists($archive_file)) {
             if (is_dir($archive_file))
-                throw new \InvalidArgumentException($archive_file . ' is a directory!');
+                throw new \InvalidArgumentException($archive_file.' is a directory!');
             else {
-                throw new \InvalidArgumentException('File "' . $archive_file . '" already exists!');
+                throw new \InvalidArgumentException('File "'.$archive_file.'" already exists!');
             }
         }
 
@@ -73,11 +73,11 @@ 
                 case 'full':
                     $destination = ltrim($file_to_pack, '/');
                     $files_list[$destination] = $file_to_pack;
-                    $output->writeln('<comment>' . $file_to_pack . ' => ' . $destination . '</comment>', OutputInterface::VERBOSITY_VERBOSE);
+                    $output->writeln('<comment>'.$file_to_pack.' => '.$destination.'</comment>', OutputInterface::VERBOSITY_VERBOSE);
                     break;
                 case 'root':
                     if (is_dir($file_to_pack)) {
-                        $output->writeln('<comment>' . $file_to_pack . ' => root</comment>', OutputInterface::VERBOSITY_VERBOSE);
+                        $output->writeln('<comment>'.$file_to_pack.' => root</comment>', OutputInterface::VERBOSITY_VERBOSE);
                         if (!isset($files_list[''])) {
                             $files_list[''] = $file_to_pack;
                         } elseif (is_string($files_list[''])) {
@@ -86,35 +86,35 @@ 
                             $files_list[''][] = $file_to_pack;
                         }
                     } else {
-                        $output->writeln('<comment>' . $file_to_pack . ' => ' . basename($file_to_pack) . '</comment>', OutputInterface::VERBOSITY_VERBOSE);
+                        $output->writeln('<comment>'.$file_to_pack.' => '.basename($file_to_pack).'</comment>', OutputInterface::VERBOSITY_VERBOSE);
                         $files_list[basename($file_to_pack)] = $file_to_pack;
                     }
                     break;
                 case 'relative':
                     $destination = ltrim($file_to_pack, '/.');
                     $files_list[$destination] = $file_to_pack;
-                    $output->writeln('<comment>' . $file_to_pack . ' => ' . $destination . '</comment>', OutputInterface::VERBOSITY_VERBOSE);
+                    $output->writeln('<comment>'.$file_to_pack.' => '.$destination.'</comment>', OutputInterface::VERBOSITY_VERBOSE);
                     break;
                 case 'basename':
                     $destination = basename($file_to_pack);
                     $files_list[$destination] = $file_to_pack;
-                    $output->writeln('<comment>' . $file_to_pack . ' => ' . $destination . '</comment>', OutputInterface::VERBOSITY_VERBOSE);
+                    $output->writeln('<comment>'.$file_to_pack.' => '.$destination.'</comment>', OutputInterface::VERBOSITY_VERBOSE);
                     break;
             }
         }
 
         $information = UnifiedArchive::prepareForArchiving($files_list, $archive_file);
         if ($dry_run) {
-            $output->writeln('Format: <info>' . $information['type'] . '</info>');
-            $output->writeln('Original size: <info>' . implode($this->formatSize($information['totalSize'])) . '</info>');
-            $output->writeln('Files: <info>' . $information['numberOfFiles'] . '</info>');
+            $output->writeln('Format: <info>'.$information['type'].'</info>');
+            $output->writeln('Original size: <info>'.implode($this->formatSize($information['totalSize'])).'</info>');
+            $output->writeln('Files: <info>'.$information['numberOfFiles'].'</info>');
             foreach ($information['files'] as $destination => $source) {
                 // is folder
                 if ($source === null) {
                     continue;
                 }
 
-                $output->writeln($source . ' => <comment>' . $destination . '</comment>');
+                $output->writeln($source.' => <comment>'.$destination.'</comment>');
             }
             return 0;
         }
@@ -124,10 +124,10 @@ 
         $progressBar = new ProgressBar($output, $information['numberOfFiles']);
         $progressBar->setFormat('archiving');
         $progressBar->start();
-        $archived_files = UnifiedArchive::archiveFiles($files_list, $archive_file, $compression, $password, function ($currentFile, $totalFiles, $fsFilename, $archiveFilename)
+        $archived_files = UnifiedArchive::archiveFiles($files_list, $archive_file, $compression, $password, function($currentFile, $totalFiles, $fsFilename, $archiveFilename)
             use ($progressBar) {
             if ($fsFilename === null) {
-                $progressBar->setMessage('Creating ' . $archiveFilename);
+                $progressBar->setMessage('Creating '.$archiveFilename);
             } else {
                 $progressBar->setMessage($fsFilename);
             }
@@ -146,8 +146,8 @@ 
             $archive->setComment($comment);
         }
 
-        $output->writeln('Created <info>' . $archive_file . '</info> with <comment>' . $archived_files . '</comment> file(s) ('
-                         . implode($this->formatSize($archive->getOriginalSize())) . ') of total size '
+        $output->writeln('Created <info>'.$archive_file.'</info> with <comment>'.$archived_files.'</comment> file(s) ('
+                         . implode($this->formatSize($archive->getOriginalSize())).') of total size '
                          . implode($this->formatSize(filesize($archive_file))));
 
         return 0;

src/Commands/ListCommand.php

Spacing +3 added lines, -3 removed lines

@@ -60,17 +60,17 @@
             foreach ($archive->getFileNames($filter) as $file) {
                 $details = $archive->getFileData($file);
                 $output->writeln(($details->isCompressed && $details->uncompressedSize > 0 ? 'x' : '-')
-                                 . ' ' . str_pad(
+                                 . ' '.str_pad(
                                      $human_readable_size ? implode($this->formatSize($details->uncompressedSize)) : $details->uncompressedSize,
                                      $uncomp_size_length,
                                      ' ',
                                      STR_PAD_LEFT)
-                                 . ' ' . str_pad(
+                                 . ' '.str_pad(
                                      $human_readable_size ? implode($this->formatSize($details->compressedSize)) : $details->compressedSize,
                                      $comp_size_length,
                                      ' ',
                                      STR_PAD_LEFT)
-                                 . ' ' . $this->formatDateShort($details->modificationTime) . ' ' . $details->path);
+                                 . ' '.$this->formatDateShort($details->modificationTime).' '.$details->path);
             }
         } else {
             foreach ($archive->getFileNames($filter) as $file) {

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