wapmorgan / UnifiedArchive

src/LzwStreamWrapper.php

Braces +24 added lines, -15 removed lines

@@ -11,8 +11,9 @@ 
      */
     public static function registerWrapper()
     {
-        if (!self::$registered)
-            stream_wrapper_register('compress.lzw', __CLASS__);
+        if (!self::$registered) {
+                    stream_wrapper_register('compress.lzw', __CLASS__);
+        }
         self::$registered = true;
     }
 
@@ -43,12 +44,14 @@ 
     {
         // check for compress & uncompress utility
         $this->checkBinary();
-        if (self::$installed === false)
-            throw new \Exception('compress and uncompress commands are required');
+        if (self::$installed === false) {
+                    throw new \Exception('compress and uncompress commands are required');
+        }
 
         $schema = 'compress.lzw://';
-        if (strncasecmp($schema, $path, strlen($schema)) == 0)
-            $path = substr($path, strlen($schema));
+        if (strncasecmp($schema, $path, strlen($schema)) == 0) {
+                    $path = substr($path, strlen($schema));
+        }
 
         if (file_exists($path)) {
             $this->path = realpath($path);
@@ -62,14 +65,16 @@ 
                 $this->read();
             } else {
                 $prefix = basename(__FILE__, '.php');
-                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
-                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                }
+                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
+                }
                 $this->tmp = $tmp;
                 $this->tmp2 = $tmp2;
                 $this->read();
@@ -78,14 +83,16 @@ 
             $this->path = $path;
             if (self::$forceTmpFile) {
                 $prefix = basename(__FILE__, '.php');
-                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
-                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                }
+                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
+                }
                 $this->tmp = $tmp;
                 $this->tmp2 = $tmp2;
                 $this->pointer = 0;
@@ -266,7 +273,9 @@ 
         }
         if ($this->tmp !== null) {
             unlink($this->tmp);
-            if (file_exists($this->tmp2)) unlink($this->tmp2);
+            if (file_exists($this->tmp2)) {
+             unlink($this->tmp2);
+            }
         } else {
             $this->data = null;
         }

src/Archive7z.php

Braces +7 added lines, -6 removed lines

@@ -10,13 +10,13 @@ 
      */
     public static function getBinaryVersion()
     {
-        if (method_exists(__CLASS__, 'makeBinary7z'))
-            try {
+        if (method_exists(__CLASS__, 'makeBinary7z')) {
+                    try {
                 $binary = static::makeBinary7z();
+        }
             } catch (\Exception $e) {
                 return false;
-            }
-        else {
+            } else {
             // some hack for gemorroj/archive7z 4.x version
             try {
                 $seven_zip = new self(null);
@@ -29,8 +29,9 @@ 
 
         $process = new Process([str_replace('\\', '/', $binary)]);
         $result = $process->mustRun()->getOutput();
-        if (!preg_match('~7-Zip (\([a-z]\) )?(\[[\d]+\] )?(?<version>\d+\.\d+)~i', $result, $version))
-            return false;
+        if (!preg_match('~7-Zip (\([a-z]\) )?(\[[\d]+\] )?(?<version>\d+\.\d+)~i', $result, $version)) {
+                    return false;
+        }
 
         return $version['version'];
     }

src/Drivers/TarByPhar.php

Braces +3 added lines, -2 removed lines

@@ -203,8 +203,9 @@
         $deleted = 0;
 
         foreach ($files as $i => $file) {
-            if ($this->tar->delete($file))
-                $deleted++;
+            if ($this->tar->delete($file)) {
+                            $deleted++;
+            }
         }
 
         $this->tar = null;

src/Drivers/Rar.php

Braces +12 added lines, -4 removed lines

@@ -100,7 +100,9 @@ 
     {
         $information = new ArchiveInformation();
         foreach ($this->rar->getEntries() as $i => $entry) {
-            if ($entry->isDirectory()) continue;
+            if ($entry->isDirectory()) {
+             continue;
+            }
             $information->files[] = $entry->getName();
             $information->compressedFilesSize += $entry->getPackedSize();
             $information->uncompressedFilesSize += $entry->getUnpackedSize();
@@ -115,7 +117,9 @@ 
     {
         $files = [];
         foreach ($this->rar->getEntries() as $i => $entry) {
-            if ($entry->isDirectory()) continue;
+            if ($entry->isDirectory()) {
+             continue;
+            }
             $files[] = $entry->getName();
         }
         return $files;
@@ -151,7 +155,9 @@ 
     public function getFileContent($fileName)
     {
         $entry = $this->rar->getEntry($fileName);
-        if ($entry->isDirectory()) return false;
+        if ($entry->isDirectory()) {
+         return false;
+        }
         return stream_get_contents($entry->getStream());
     }
 
@@ -163,7 +169,9 @@ 
     public function getFileStream($fileName)
     {
         $entry = $this->rar->getEntry($fileName);
-        if ($entry->isDirectory()) return false;
+        if ($entry->isDirectory()) {
+         return false;
+        }
         return $entry->getStream();
     }
 

src/Commands/DetailsCommand.php

Braces +3 added lines, -2 removed lines

@@ -41,8 +41,9 @@
         $output->writeln("\t" . 'compressed: ' . implode(' ', $this->formatSize($details->compressedSize, 2)));
         $output->writeln("\t" . 'ratio: <info>' . round($details->uncompressedSize / $details->compressedSize, 6) . '/1 (' . floor($details->compressedSize / $details->uncompressedSize * 100) . '%</info>)');
         $output->writeln('Modificated: ' . $this->formatDate($details->modificationTime));
-        if (!empty($comment = $details->comment))
-            $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        if (!empty($comment = $details->comment)) {
+                    $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        }
 
         if (empty($input->getArgument('file'))) {
             $helper = $this->getHelper('question');

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');
+            }
         }
     }
 

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!');
             }
         }

src/PclZipInterface.php

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/ArchiveEntry.php

Braces +3 added lines, -2 removed lines

@@ -46,8 +46,9 @@
         $this->compressedSize = $compressedSize;
         $this->uncompressedSize = $uncompressedSize;
         $this->modificationTime = $modificationTime;
-        if ($isCompressed === null)
-            $isCompressed = $uncompressedSize !== $compressedSize;
+        if ($isCompressed === null) {
+                    $isCompressed = $uncompressedSize !== $compressedSize;
+        }
         $this->isCompressed = $isCompressed;
         $this->comment = $comment;
         $this->crc32 = $crc32;