wapmorgan / UnifiedArchive

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

Braces +96 added lines, -56 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) {
@@ -338,8 +352,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
@@ -429,15 +445,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);
@@ -504,8 +524,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) {
@@ -534,8 +558,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);
 
@@ -560,18 +587,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;
     }
@@ -586,11 +616,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];
     }
@@ -646,9 +678,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) {
@@ -723,21 +758,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;
     }
@@ -773,9 +813,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/Drivers/TarByPear.php

Braces +26 added lines, -18 removed lines

@@ -123,21 +123,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;
@@ -194,8 +197,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;
@@ -240,14 +244,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);
@@ -262,8 +268,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);
     }
@@ -273,8 +280,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

Braces +11 added lines, -8 removed lines

@@ -60,10 +60,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();
+        }
     }
 
     /**
@@ -74,8 +75,9 @@ 
     {
         static::init();
 
-        if (static::$zippy === false)
-            return false;
+        if (static::$zippy === false) {
+                    return false;
+        }
 
         switch ($format) {
             case Formats::TAR_BZIP:
@@ -189,8 +191,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/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/Drivers/Zip.php

Braces +36 added lines, -24 removed lines

@@ -63,8 +63,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);
+        }
     }
 
     /**
@@ -97,8 +98,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'];
@@ -115,8 +117,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;
@@ -153,8 +156,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;
     }
 
@@ -175,8 +179,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);
     }
@@ -188,8 +193,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;
     }
@@ -204,8 +210,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++;
         }
 
@@ -228,11 +235,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++;
             }
         }
@@ -267,8 +276,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 = method_exists($zip, 'setEncryptionName');
@@ -279,11 +289,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/Drivers/SevenZip.php

Braces +24 added lines, -16 removed lines

@@ -97,11 +97,13 @@ 
      */
     public static function getInstallationInstruction()
     {
-        if (!class_exists('\Archive7z\Archive7z'))
-            return 'install library `gemorroj/archive7z` and console program p7zip (7za)';
+        if (!class_exists('\Archive7z\Archive7z')) {
+                    return 'install library `gemorroj/archive7z` and console program p7zip (7za)';
+        }
 
-        if (Archive7z::getBinaryVersion() === false)
-            return 'install console program p7zip (7za)';
+        if (Archive7z::getBinaryVersion() === false) {
+                    return 'install console program p7zip (7za)';
+        }
 
         return null;
     }
@@ -114,8 +116,9 @@ 
         try {
             $this->format = $format;
             $this->sevenZip = new Archive7z($archiveFileName, null, null);
-            if ($password !== null)
-                $this->sevenZip->setPassword($password);
+            if ($password !== null) {
+                            $this->sevenZip->setPassword($password);
+            }
         } catch (\Archive7z\Exception $e) {
             throw new Exception('Could not open 7Zip archive: '.$e->getMessage(), $e->getCode(), $e);
         }
@@ -133,8 +136,9 @@ 
                 continue;
             }
 
-            if (!isset($can_get_unix_path))
-                $can_get_unix_path = method_exists($entry, 'getUnixPath');
+            if (!isset($can_get_unix_path)) {
+                            $can_get_unix_path = method_exists($entry, 'getUnixPath');
+            }
 
             $information->files[] = $can_get_unix_path
                 ? $entry->getUnixPath()
@@ -152,8 +156,9 @@ 
     {
         $files = [];
         foreach ($this->sevenZip->getEntries() as $entry) {
-            if ($entry->isDirectory())
-                continue;
+            if ($entry->isDirectory()) {
+                            continue;
+            }
             $files[] = $entry->getPath();
         }
         return $files;
@@ -294,8 +299,9 @@ 
     public function addFileFromString($inArchiveName, $content)
     {
         $tmp_file = tempnam(sys_get_temp_dir(), 'ua');
-        if (!$tmp_file)
-            throw new ArchiveModificationException('Could not create temporarily file');
+        if (!$tmp_file) {
+                    throw new ArchiveModificationException('Could not create temporarily file');
+        }
 
         file_put_contents($tmp_file, $content);
         unset($content);
@@ -325,8 +331,9 @@ 
 
         try {
             $seven_zip = new Archive7z($archiveFileName);
-            if ($password !== null)
-                $seven_zip->setPassword($password);
+            if ($password !== null) {
+                            $seven_zip->setPassword($password);
+            }
             $seven_zip->setCompressionLevel($compressionLevelMap[$compressionLevel]);
             foreach ($files as $localName => $filename) {
                 if ($filename !== null) {
@@ -355,8 +362,9 @@ 
             Formats::TAR,
             Formats::LZMA,
             Formats::ZIP]
-        ))
-            return self::canRenameFiles();
+        )) {
+                    return self::canRenameFiles();
+        }
 
         return false;
     }

src/ArchiveEntry.php

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,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;
     }

src/CamApplication.php

Braces +54 added lines, -37 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;
     }
@@ -141,17 +143,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');
+            }
         }
     }
 
@@ -181,25 +184,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 'Exctracted '.$extracted.' file(s) to '.$output.PHP_EOL;
             }
-            if (!empty($errored)) echo 'Errored: '.implode(', ', $errored).PHP_EOL;
-            if ($extracted > 0) echo 'Exctracted '.$extracted.' file(s) to '.$output.PHP_EOL;
         }
     }
 
@@ -258,8 +272,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;
+            }
         }
     }
 
@@ -272,10 +287,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;
+        }
     }
 
     /**
@@ -293,9 +309,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;
@@ -310,9 +326,9 @@ 
     {
         $password = isset($args['--password']) ? $args['--password'] : null;
         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 {
@@ -329,10 +345,11 @@ 
             }
 
             $archived_files = UnifiedArchive::archiveFiles($files, $args['ARCHIVE'], BasicDriver::COMPRESSION_AVERAGE, $password);
-            if ($archived_files === false)
-                echo 'Error'.PHP_EOL;
-            else
-                echo 'Created archive ' . $args['ARCHIVE'] . ' with ' . $archived_files . ' file(s) of total size ' . implode('', $this->formatSize(filesize($args['ARCHIVE']))) . PHP_EOL;
+            if ($archived_files === false) {
+                            echo 'Error'.PHP_EOL;
+            } else {
+                            echo 'Created archive ' . $args['ARCHIVE'] . ' with ' . $archived_files . ' file(s) of total size ' . implode('', $this->formatSize(filesize($args['ARCHIVE']))) . PHP_EOL;
+            }
         }
     }