wapmorgan / UnifiedArchive

src/CamApplication.php

Braces +51 added lines, -34 removed lines

@@ -12,12 +12,14 @@ 
      */
     protected function open($file)
     {
-        if (!UnifiedArchive::canOpenArchive($file))
-            throw new Exception('Could not open archive '.$file.'. Try installing suggested packages or run `cam -f` to see formats support.');
+        if (!UnifiedArchive::canOpenArchive($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);
-        if ($archive === null)
-            throw new Exception('Could not open archive '.$file);
+        if ($archive === null) {
+                    throw new Exception('Could not open archive '.$file);
+        }
 
         return $archive;
     }
@@ -135,17 +137,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');
+            }
         }
     }
 
@@ -175,25 +178,36 @@ 
         $archive = $this->open($args['ARCHIVE']);
         $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;
         }
     }
 
@@ -252,8 +266,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;
+            }
         }
     }
 
@@ -266,10 +281,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;
+        }
     }
 
     /**
@@ -279,17 +295,18 @@ 
     public function create($args)
     {
         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 {
             $archived_files = UnifiedArchive::archiveFiles($args['FILES_ON_DISK'], $args['ARCHIVE']);
-            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;
+            }
         }
     }
 }

src/ArchiveEntry.php

Braces +3 added lines, -2 removed lines

@@ -63,8 +63,9 @@
         $this->compressed_size = $this->compressedSize = $compressedSize;
         $this->uncompressed_size = $this->uncompressedSize = $uncompressedSize;
         $this->mtime = $this->modificationTime = $modificationTime;
-        if ($isCompressed === null)
-            $isCompressed = $uncompressedSize !== $compressedSize;
+        if ($isCompressed === null) {
+                    $isCompressed = $uncompressedSize !== $compressedSize;
+        }
         $this->is_compressed = $this->isCompressed = $isCompressed;
     }
 }
\ No newline at end of file

src/Formats/OneFileFormat.php

Braces +19 added lines, -10 removed lines

@@ -25,8 +25,9 @@ 
      */
     public function __construct($archiveFileName)
     {
-        if (static::FORMAT_SUFFIX === null)
-            throw new \Exception('Format should be initialized');
+        if (static::FORMAT_SUFFIX === null) {
+                    throw new \Exception('Format should be initialized');
+        }
         $this->fileName = $archiveFileName;
         $this->inArchiveFileName = basename($archiveFileName, '.'.self::FORMAT_SUFFIX);
     }
@@ -93,11 +94,13 @@ 
     public function extractArchive($outputFolder)
     {
         $data = $this->getFileContent($this->inArchiveFileName);
-        if ($data === false)
-            throw new Exception('Could not extract archive');
+        if ($data === false) {
+                    throw new Exception('Could not extract archive');
+        }
 
-        if (file_put_contents($outputFolder.$this->inArchiveFileName, $data) !== false)
-            return 1;
+        if (file_put_contents($outputFolder.$this->inArchiveFileName, $data) !== false) {
+                    return 1;
+        }
     }
 
     /**
@@ -130,12 +133,18 @@ 
      * @throws \wapmorgan\UnifiedArchive\UnsupportedOperationException
      */
     public static function createArchive(array $files, $archiveFileName){
-        if (count($files) > 1) return false;
+        if (count($files) > 1) {
+         return false;
+        }
         $filename = array_shift($files);
-        if (is_null($filename)) return false; // invalid list
+        if (is_null($filename)) {
+         return false;
+        }
+        // invalid list
         if (file_put_contents($archiveFileName,
-                static::compressData(file_get_contents($filename))) !== false)
-            return 1;
+                static::compressData(file_get_contents($filename))) !== false) {
+                    return 1;
+        }
     }
 
     /**

src/Formats/SevenZip.php

Braces +3 added lines, -2 removed lines

@@ -47,8 +47,9 @@
     public function getFileNames()
     {
         $files = [];
-        foreach ($this->sevenZip->getEntries() as $entry)
-            $files[] = $entry->getPath();
+        foreach ($this->sevenZip->getEntries() as $entry) {
+                    $files[] = $entry->getPath();
+        }
         return $files;
     }
 

src/Formats/Rar.php

Braces +6 added lines, -2 removed lines

@@ -101,7 +101,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());
     }
 
@@ -113,7 +115,9 @@ 
     public function getFileResource($fileName)
     {
         $entry = $this->rar->getEntry($fileName);
-        if ($entry->isDirectory()) return false;
+        if ($entry->isDirectory()) {
+         return false;
+        }
         return $entry->getStream();
     }
 

src/Formats/Tar.php

Braces +50 added lines, -34 removed lines

@@ -141,11 +141,13 @@ 
     {
         static::checkRequirements();
 
-        if (static::$enabledPharData)
-            return static::createArchiveForPhar($files, $archiveFileName);
+        if (static::$enabledPharData) {
+                    return static::createArchiveForPhar($files, $archiveFileName);
+        }
 
-        if (static::$enabledPearTar)
-            return static::createArchiveForPear($files, $archiveFileName);
+        if (static::$enabledPearTar) {
+                    return static::createArchiveForPear($files, $archiveFileName);
+        }
 
         throw new Exception('Archive_Tar nor PharData not available');
     }
@@ -177,21 +179,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 Exception('Error when adding directory '.$localName.' to archive');
+                if ($tar->addString($localName, '') === false) {
+                                    throw new Exception('Error when adding directory '.$localName.' to archive');
+                }
             } else {
-                if ($tar->addModify($filename, $add_dir, $remove_dir) === false)
-                    throw new Exception('Error when adding file '.$filename.' to archive');
+                if ($tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                    throw new Exception('Error when adding file '.$filename.' to archive');
+                }
             }
         }
         $tar = null;
@@ -279,8 +284,9 @@ 
 
         $this->archiveFileName = realpath($archiveFileName);
         $this->archiveType = static::detectArchiveType($this->archiveFileName);
-        if ($this->archiveType === false)
-            throw new \Exception('Could not detect type for archive '.$this->archiveFileName);
+        if ($this->archiveType === false) {
+                    throw new \Exception('Could not detect type for archive '.$this->archiveFileName);
+        }
         $this->open($this->archiveType);
     }
 
@@ -392,8 +398,9 @@ 
      */
     public function isFileExists($fileName)
     {
-        if ($this->tar instanceof Archive_Tar)
-            return isset($this->pearFilesIndex[$fileName]);
+        if ($this->tar instanceof Archive_Tar) {
+                    return isset($this->pearFilesIndex[$fileName]);
+        }
 
         try {
             $this->tar->offsetGet($fileName);
@@ -411,14 +418,16 @@ 
     public function getFileData($fileName)
     {
         if ($this->tar instanceof Archive_Tar) {
-            if (!isset($this->pearFilesIndex[$fileName]))
-                throw new Exception('File '.$fileName.' is not found in archive files list');
+            if (!isset($this->pearFilesIndex[$fileName])) {
+                            throw new Exception('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 Exception('File '.$fileName.' is not found in Tar archive');
+            if (!isset($files_list[$index])) {
+                            throw new Exception('File '.$fileName.' is not found in Tar archive');
+            }
 
             $data = $files_list[$index];
             unset($files_list);
@@ -442,8 +451,9 @@ 
     public function getFileContent($fileName)
     {
         if ($this->tar instanceof Archive_Tar) {
-            if (!isset($this->pearFilesIndex[$fileName]))
-                throw new Exception('File '.$fileName.' is not found in archive files list');
+            if (!isset($this->pearFilesIndex[$fileName])) {
+                            throw new Exception('File '.$fileName.' is not found in archive files list');
+            }
 
             return $this->tar->extractInString($fileName);
         }
@@ -460,12 +470,14 @@ 
     {
         $resource = fopen('php://temp', 'r+');
         if ($this->tar instanceof Archive_Tar) {
-            if (!isset($this->pearFilesIndex[$fileName]))
-                throw new Exception('File '.$fileName.' is not found in archive files list');
+            if (!isset($this->pearFilesIndex[$fileName])) {
+                            throw new Exception('File '.$fileName.' is not found in archive files list');
+            }
 
             fwrite($resource, $this->tar->extractInString($fileName));
-        } else
-            fwrite($resource, $this->tar->offsetGet($fileName)->getContent());
+        } else {
+                    fwrite($resource, $this->tar->offsetGet($fileName)->getContent());
+        }
 
         rewind($resource);
         return $resource;
@@ -520,14 +532,16 @@ 
      */
     public function deleteFiles(array $files)
     {
-        if ($this->tar instanceof Archive_Tar)
-            throw new UnsupportedOperationException();
+        if ($this->tar instanceof Archive_Tar) {
+                    throw new UnsupportedOperationException();
+        }
 
         $deleted = 0;
 
         foreach ($files as $i => $file) {
-            if ($this->tar->delete($file))
-                $deleted++;
+            if ($this->tar->delete($file)) {
+                            $deleted++;
+            }
         }
 
         $this->tar = null;
@@ -550,11 +564,13 @@ 
                 $remove_dir = dirname($filename);
                 $add_dir = dirname($localName);
                 if (is_null($filename)) {
-                    if ($this->tar->addString($localName, "") === false)
-                        return false;
+                    if ($this->tar->addString($localName, "") === false) {
+                                            return false;
+                    }
                 } else {
-                    if ($this->tar->addModify($filename, $add_dir, $remove_dir) === false)
-                        return false;
+                    if ($this->tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                            return false;
+                    }
                     $added++;
                 }
             }

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

Braces +173 added lines, -96 removed lines

@@ -132,8 +132,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);
+        }
         $report = array();
 
         $options = func_get_args();
@@ -155,29 +158,41 @@ 
         // filters initiation
         $filters = array();
         if (isset($options[PCLZIP_OPT_REMOVE_PATH])
-            && !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) { $key = basename($key); };
-        if (isset($options[PCLZIP_OPT_ADD_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) { $key = basename($key);
+        }
+        };
+        if (isset($options[PCLZIP_OPT_ADD_PATH])) {
+                    $filters[] = function (&$key, &$value) use ($options) {
                 $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/').'/'.
                     ltrim($key, '/');
+        }
             };
 
         if (isset($options[PCLZIP_CB_PRE_ADD])
-            && is_callable($options[PCLZIP_CB_PRE_ADD]))
-            $preAddCallback = $options[PCLZIP_CB_PRE_ADD];
-        else $preAddCallback = function () { return 1; };
+            && is_callable($options[PCLZIP_CB_PRE_ADD])) {
+                    $preAddCallback = $options[PCLZIP_CB_PRE_ADD];
+        } else {
+         $preAddCallback = function () { return 1;
+        }
+        };
 
         if (isset($options[PCLZIP_CB_POST_ADD])
-            && is_callable($options[PCLZIP_CB_POST_ADD]))
-            $postAddCallback = $options[PCLZIP_CB_POST_ADD];
-        else $postAddCallback = function () { return 1; };
+            && is_callable($options[PCLZIP_CB_POST_ADD])) {
+                    $postAddCallback = $options[PCLZIP_CB_POST_ADD];
+        } else {
+         $postAddCallback = function () { return 1;
+        }
+        };
 
-        if (isset($options[PCLZIP_OPT_COMMENT]))
-            $this->archive->setArchiveComment($options[PCLZIP_OPT_COMMENT]);
+        if (isset($options[PCLZIP_OPT_COMMENT])) {
+                    $this->archive->setArchiveComment($options[PCLZIP_OPT_COMMENT]);
+        }
 
         // scan filesystem for files list
         $files_list = array();
@@ -208,20 +223,23 @@ 
             // apply filters to a file
             $localname = $file_to_add;
             $filename = $file_to_add;
-            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 (is_file($filename))
-                    $this->archive->addFile($file_header->filename,
+                if (strlen(basename($file_header->stored_filename)) > 255) {
+                                    $file_header->status = 'filename_too_long';
+                }
+                if (is_file($filename)) {
+                                    $this->archive->addFile($file_header->filename,
                         $file_header->stored_filename);
-                else if (is_dir($filename))
-                    $this->archive->addEmptyDir($file_header->stored_filename);
+                } else if (is_dir($filename)) {
+                                    $this->archive->addEmptyDir($file_header->stored_filename);
+                }
             } else {
                 //
                 // File was skipped
@@ -285,40 +303,53 @@ 
         }
 
         // 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 = 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) { $key = basename($key); };
-        if (isset($options[PCLZIP_OPT_ADD_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+        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) {
                 $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/').'/'.
                     ltrim($key, '/');
+        }
             };
 
         if (isset($options[PCLZIP_CB_PRE_EXTRACT])
-            && is_callable($options[PCLZIP_CB_PRE_EXTRACT]))
-            $preExtractCallback = $options[PCLZIP_CB_PRE_EXTRACT];
-        else $preExtractCallback = function () { return 1; };
+            && is_callable($options[PCLZIP_CB_PRE_EXTRACT])) {
+                    $preExtractCallback = $options[PCLZIP_CB_PRE_EXTRACT];
+        } else {
+         $preExtractCallback = function () { return 1;
+        }
+        };
 
         if (isset($options[PCLZIP_CB_POST_EXTRACT])
-            && is_callable($options[PCLZIP_CB_POST_EXTRACT]))
-            $postExtractCallback = $options[PCLZIP_CB_POST_EXTRACT];
-        else $postExtractCallback = function () { return 1; };
+            && is_callable($options[PCLZIP_CB_POST_EXTRACT])) {
+                    $postExtractCallback = $options[PCLZIP_CB_POST_EXTRACT];
+        } else {
+         $postExtractCallback = function () { return 1;
+        }
+        };
 
         // exact matching
-        if (isset($options[PCLZIP_OPT_BY_NAME]))
-            $selectFilter = function ($key, $value) use ($options) {
+        if (isset($options[PCLZIP_OPT_BY_NAME])) {
+                    $selectFilter = function ($key, $value) use ($options) {
                 $allowedNames = is_array($options[PCLZIP_OPT_BY_NAME])
                     ? $options[PCLZIP_OPT_BY_NAME]
                     : explode(',', $options[PCLZIP_OPT_BY_NAME]);
+        }
                 foreach ($allowedNames as $name) {
                     // select directory with nested files
                     if (in_array(substr($name, -1), array('/', '\\'))) {
@@ -339,50 +370,64 @@ 
                 return self::SELECT_FILTER_REFUSE;
             };
         // <ereg> rule
-        else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg'))
-            $selectFilter = function ($key, $value) use ($options) {
+        else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg')) {
+                    $selectFilter = function ($key, $value) use ($options) {
                 return (ereg($options[PCLZIP_OPT_BY_EREG], $key) !== false)
                     ? self::SELECT_FILTER_PASS
                     : self::SELECT_FILTER_REFUSE;
+        }
             };
         // <preg_match> rule
-        else if (isset($options[PCLZIP_OPT_BY_PREG]))
-            $selectFilter = function ($key, $value) use ($options) {
+        else if (isset($options[PCLZIP_OPT_BY_PREG])) {
+                    $selectFilter = function ($key, $value) use ($options) {
                 return preg_match($options[PCLZIP_OPT_BY_PREG], $key)
                     ? self::SELECT_FILTER_PASS
                     : self::SELECT_FILTER_REFUSE;
+        }
             };
         // index rule
-        else if (isset($options[PCLZIP_OPT_BY_INDEX]))
-            $selectFilter = function ($key, $value, $index) use ($options) {
+        else if (isset($options[PCLZIP_OPT_BY_INDEX])) {
+                    $selectFilter = function ($key, $value, $index) use ($options) {
                 $allowedIndexes = array();
+        }
                 foreach ($options[PCLZIP_OPT_BY_INDEX] 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 in_array($index, $allowedIndexes) ? self::SELECT_FILTER_PASS
                     : self::SELECT_FILTER_REFUSE;
             };
         // no rule
-        else
-            $selectFilter = function () { return self::SELECT_FILTER_PASS; };
+        else {
+                    $selectFilter = function () { return self::SELECT_FILTER_PASS;
+        }
+        };
 
-        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) {
@@ -452,8 +497,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
@@ -545,8 +592,11 @@ 
      */
     public function add($content)
     {
-        if (is_array($content)) $paths_list = $content;
-        else $paths_list = array_map(explode(',', $content));
+        if (is_array($content)) {
+         $paths_list = $content;
+        } else {
+         $paths_list = array_map(explode(',', $content));
+        }
         $report = array();
 
         $options = func_get_args();
@@ -568,30 +618,41 @@ 
         // filters initiation
         $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) { $key = basename($key); };
-        if (isset($options[PCLZIP_OPT_ADD_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+        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) {
                 $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/').'/'.
                     ltrim($key, '/');
+        }
             };
 
         if (isset($options[PCLZIP_CB_PRE_ADD])
-            && is_callable($options[PCLZIP_CB_PRE_ADD]))
-            $preAddCallback = $options[PCLZIP_CB_PRE_ADD];
-        else $preAddCallback = function () { return 1; };
+            && is_callable($options[PCLZIP_CB_PRE_ADD])) {
+                    $preAddCallback = $options[PCLZIP_CB_PRE_ADD];
+        } else {
+         $preAddCallback = function () { return 1;
+        }
+        };
 
         if (isset($options[PCLZIP_CB_POST_ADD])
-            && is_callable($options[PCLZIP_CB_POST_ADD]))
-            $postAddCallback = $options[PCLZIP_CB_POST_ADD];
-        else $postAddCallback = function () { return 1; };
+            && is_callable($options[PCLZIP_CB_POST_ADD])) {
+                    $postAddCallback = $options[PCLZIP_CB_POST_ADD];
+        } else {
+         $postAddCallback = function () { return 1;
+        }
+        };
 
-        if (isset($options[PCLZIP_OPT_COMMENT]))
-            $this->archive->setArchiveComment($options[PCLZIP_OPT_COMMENT]);
+        if (isset($options[PCLZIP_OPT_COMMENT])) {
+                    $this->archive->setArchiveComment($options[PCLZIP_OPT_COMMENT]);
+        }
         if (isset($options[PCLZIP_OPT_ADD_COMMENT])) {
             $comment =
                 ($comment = $this->archive->getArchiveComment() !== false)
@@ -645,11 +706,12 @@ 
         );
 
         // exact matching
-        if (isset($options[PCLZIP_OPT_BY_NAME]))
-            $selectFilter = function ($key, $value) use ($options) {
+        if (isset($options[PCLZIP_OPT_BY_NAME])) {
+                    $selectFilter = function ($key, $value) use ($options) {
                 $allowedNames = is_array($options[PCLZIP_OPT_BY_NAME])
                     ? $options[PCLZIP_OPT_BY_NAME]
                     : explode(',', $options[PCLZIP_OPT_BY_NAME]);
+        }
                 foreach ($allowedNames as $name) {
                     // select directory with nested files
                     if (in_array(substr($name, -1), array('/', '\\'))) {
@@ -670,28 +732,34 @@ 
                 return self::SELECT_FILTER_REFUSE;
             };
         // <ereg> rule
-        else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg'))
-            $selectFilter = function ($key, $value) use ($options) {
+        else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg')) {
+                    $selectFilter = function ($key, $value) use ($options) {
                 return (ereg($options[PCLZIP_OPT_BY_EREG], $key) !== false)
                     ? self::SELECT_FILTER_PASS
                     : self::SELECT_FILTER_REFUSE;
+        }
             };
         // <preg_match> rule
-        else if (isset($options[PCLZIP_OPT_BY_PREG]))
-            $selectFilter = function ($key, $value) use ($options) {
+        else if (isset($options[PCLZIP_OPT_BY_PREG])) {
+                    $selectFilter = function ($key, $value) use ($options) {
                 return preg_match($options[PCLZIP_OPT_BY_PREG], $key)
                     ? self::SELECT_FILTER_PASS
                     : self::SELECT_FILTER_REFUSE;
+        }
             };
         // index rule
-        else if (isset($options[PCLZIP_OPT_BY_INDEX]))
-            $selectFilter = function ($key, $value, $index) use ($options) {
+        else if (isset($options[PCLZIP_OPT_BY_INDEX])) {
+                    $selectFilter = function ($key, $value, $index) use ($options) {
                 $allowedIndexes = array();
+        }
                 foreach ($options[PCLZIP_OPT_BY_INDEX] 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 in_array($index, $allowedIndexes)
@@ -699,8 +767,10 @@ 
                     : self::SELECT_FILTER_REFUSE;
             };
         // no rule
-        else
-            $selectFilter = function () { return self::SELECT_FILTER_PASS; };
+        else {
+                    $selectFilter = function () { return self::SELECT_FILTER_PASS;
+        }
+        };
 
         foreach ($this->listContent() as $file_header) {
             // select by select rule
@@ -752,8 +822,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) {
@@ -782,8 +856,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);
 

src/Formats/Iso.php

Braces +21 added lines, -12 removed lines

@@ -52,8 +52,9 @@ 
 
         /** @var \CVolumeDescriptor $usedDesc */
         $usedDesc = $this->iso->GetDescriptor(SUPPLEMENTARY_VOLUME_DESC);
-        if (!$usedDesc)
-            $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        if (!$usedDesc) {
+                    $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        }
         $this->blockSize = $usedDesc->iBlockSize;
         $directories = $usedDesc->LoadMPathTable($this->iso);
         // iterate over all directories
@@ -74,8 +75,9 @@ 
             if ($files) {
                 /** @var \CFileDirDescriptors $file */
                 foreach ($files as $file) {
-                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory())
-                        continue;
+                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory()) {
+                                            continue;
+                    }
                     $this->files[$file->Location] = $directory.$file->strd_FileId;
                     $this->filesSize += $file->DataLen;
 
@@ -127,8 +129,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->filesData[$fileName]))
-            return false;
+        if (!isset($this->filesData[$fileName])) {
+                    return false;
+        }
 
         return new ArchiveEntry($fileName, $this->filesData[$fileName]['size'],
             $this->filesData[$fileName]['size'], $this->filesData[$fileName]['mtime'],false);
@@ -142,11 +145,14 @@ 
     public function getFileContent($fileName)
     {
         $Location = array_search($fileName, $this->files, true);
-        if (!isset($this->filesData[$fileName])) return false;
+        if (!isset($this->filesData[$fileName])) {
+         return false;
+        }
         $data = $this->filesData[$fileName];
         $Location_Real = $Location * $this->blockSize;
-        if ($this->iso->Seek($Location_Real, SEEK_SET) === false)
-            return false;
+        if ($this->iso->Seek($Location_Real, SEEK_SET) === false) {
+                    return false;
+        }
 
         return $this->iso->Read($data['size']);
     }
@@ -159,11 +165,14 @@ 
     public function getFileResource($fileName)
     {
         $Location = array_search($fileName, $this->files, true);
-        if (!isset($this->filesData[$fileName])) return false;
+        if (!isset($this->filesData[$fileName])) {
+         return false;
+        }
         $data = $this->filesData[$fileName];
         $Location_Real = $Location * $this->blockSize;
-        if ($this->iso->Seek($Location_Real, SEEK_SET) === false)
-            return false;
+        if ($this->iso->Seek($Location_Real, SEEK_SET) === false) {
+                    return false;
+        }
 
         $resource = fopen('php://temp', 'r+');
         fwrite($resource, $this->iso->Read($data['size']));