wapmorgan / UnifiedArchive

src/TarArchive.php

Spacing +2 added lines, -2 removed lines

@@ -449,7 +449,7 @@ 
                     $compression = 'lzma2';
                     break;
                 case 'z':
-                    $tar_aname = 'compress.lzw://' . $archiveName;
+                    $tar_aname = 'compress.lzw://'.$archiveName;
                     break;
             }
 
@@ -634,7 +634,7 @@ 
                 if (!self::$enabledPharData) {
                     throw new Exception('Archive_Tar not available');
                 }
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->path);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->path);
                 break;
 
             default:

Braces +66 added lines, -44 removed lines

@@ -57,8 +57,9 @@ 
     {
         self::checkRequirements();
 
-        if (!file_exists($fileName) || !is_readable($fileName))
-            throw new Exception('Count not open file: '.$fileName);
+        if (!file_exists($fileName) || !is_readable($fileName)) {
+                    throw new Exception('Count not open file: '.$fileName);
+        }
 
         $type = self::detectArchiveType($fileName);
         if (!self::canOpenType($type)) {
@@ -168,8 +169,9 @@ 
 
         $this->path = realpath($fileName);
 
-        if (!self::$enabledPharData && !self::$enabledPearTar)
-            throw new Exception('Archive_Tar nor PharData not available');
+        if (!self::$enabledPharData && !self::$enabledPearTar) {
+                    throw new Exception('Archive_Tar nor PharData not available');
+        }
 
         $this->openArchive($type);
         $this->scanArchive();
@@ -199,8 +201,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         if ($this->tar instanceof Archive_Tar) {
             $index = array_search($fileName, $this->files, true);
@@ -226,12 +229,14 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
-        if ($this->tar instanceof Archive_Tar)
-            return $this->tar->extractInString($fileName);
-        else
-            return $this->tar[$fileName]->getContent();
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
+        if ($this->tar instanceof Archive_Tar) {
+                    return $this->tar->extractInString($fileName);
+        } else {
+                    return $this->tar[$fileName]->getContent();
+        }
     }
 
     /**
@@ -241,8 +246,9 @@ 
     {
         $tree = array(DIRECTORY_SEPARATOR);
         foreach ($this->files as $filename) {
-            if (in_array(substr($filename, -1), array('/', '\\')))
-                $tree[] = DIRECTORY_SEPARATOR.$filename;
+            if (in_array(substr($filename, -1), array('/', '\\'))) {
+                            $tree[] = DIRECTORY_SEPARATOR.$filename;
+            }
         }
 
         return $tree;
@@ -257,8 +263,9 @@ 
      */
     public function extractFiles($outputFolder, $files = null, $expandFilesList = false)
     {
-        if ($expandFilesList && $files !== null)
-            $files = self::expandFileList($this->files, $files);
+        if ($expandFilesList && $files !== null) {
+                    $files = self::expandFileList($this->files, $files);
+        }
 
         $list = array();
         if ($files === null) {
@@ -292,21 +299,25 @@ 
      */
     public function deleteFiles($fileOrFiles, $expandFilesList = false)
     {
-        if ($this->tar instanceof Archive_Tar)
-            return false;
+        if ($this->tar instanceof Archive_Tar) {
+                    return false;
+        }
 
-        if ($expandFilesList && $fileOrFiles !== null)
-            $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        if ($expandFilesList && $fileOrFiles !== null) {
+                    $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        }
 
         $files = is_string($fileOrFiles) ? array($fileOrFiles) : $fileOrFiles;
         $deleted = 0;
 
         foreach ($files as $i => $file) {
-            if (!in_array($file, $this->files, true))
-                continue;
+            if (!in_array($file, $this->files, true)) {
+                            continue;
+            }
 
-            if ($this->tar->delete($file))
-                $deleted++;
+            if ($this->tar->delete($file)) {
+                            $deleted++;
+            }
         }
 
         $this->tar = null;
@@ -333,11 +344,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_files++;
                 }
             }
@@ -416,15 +429,18 @@ 
     {
         self::checkRequirements();
 
-        if (file_exists($archiveName))
-            throw new Exception('Archive '.$archiveName.' already exists!');
+        if (file_exists($archiveName)) {
+                    throw new Exception('Archive '.$archiveName.' already exists!');
+        }
 
         $fileOrFiles = self::createFilesList($fileOrFiles);
 
         // fake creation: return archive data
         if ($emulate) {
             $totalSize = 0;
-            foreach ($fileOrFiles as $fn) $totalSize += filesize($fn);
+            foreach ($fileOrFiles as $fn) {
+             $totalSize += filesize($fn);
+            }
 
             return array(
                 'totalSize' => $totalSize,
@@ -453,21 +469,25 @@ 
                     break;
             }
 
-            if (isset($tar_aname))
-                $tar = new Archive_Tar($tar_aname, $compression);
-            else
-                $tar = new Archive_Tar($archiveName, $compression);
+            if (isset($tar_aname)) {
+                            $tar = new Archive_Tar($tar_aname, $compression);
+            } else {
+                            $tar = new Archive_Tar($archiveName, $compression);
+            }
 
             foreach ($fileOrFiles as $localname => $filename) {
                 $remove_dir = dirname($filename);
                 $add_dir = dirname($localname);
 
                 if (is_null($filename)) {
-                    if ($tar->addString($localname, "") === false)
-                        return false;
+                    if ($tar->addString($localname, "") === false) {
+                                            return false;
+                    }
                 } else {
                     if ($tar->addModify($filename, $add_dir, $remove_dir)
-                        === false) return false;
+                        === false) {
+                     return false;
+                    }
                 }
             }
             $tar = null;
@@ -578,14 +598,16 @@ 
      */
     public function getFileResource($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         $resource = fopen('php://temp', 'r+');
-        if ($this->tar instanceof Archive_Tar)
-            fwrite($resource, $this->tar->extractInString($fileName));
-        else
-            fwrite($resource, $this->tar[$fileName]->getContent());
+        if ($this->tar instanceof Archive_Tar) {
+                    fwrite($resource, $this->tar->extractInString($fileName));
+        } else {
+                    fwrite($resource, $this->tar[$fileName]->getContent());
+        }
 
         rewind($resource);
         return $resource;

src/PclZipLikeZipArchiveInterface.php

Spacing +37 added lines, -38 removed lines

@@ -57,8 +57,8 @@ 
             }
         } else {
             $options = array_combine(
-                array_filter($options, function ($v) {return (bool) $v&2;}),
-                array_filter($options, function ($v) {return (bool) ($v-1)&2;})
+                array_filter($options, function($v) {return (bool) $v & 2; }),
+                array_filter($options, function($v) {return (bool) ($v - 1) & 2; })
             );
         }
 
@@ -66,12 +66,12 @@ 
         $filters = array();
         if (isset($options[PCLZIP_OPT_REMOVE_PATH])
             && !isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            $filters[] = function(&$key, &$value) use ($options) {
                 $key = str_replace($key, null, $key); };
         if (isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) { $key = basename($key); };
+            $filters[] = function(&$key, &$value) { $key = basename($key); };
         if (isset($options[PCLZIP_OPT_ADD_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            $filters[] = function(&$key, &$value) use ($options) {
                 $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/').'/'.
                 ltrim($key, '/');
             };
@@ -79,12 +79,12 @@ 
         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; };
+        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; };
+        else $postAddCallback = function() { return 1; };
 
         if (isset($options[PCLZIP_OPT_COMMENT]))
             $this->archive->setArchiveComment($options[PCLZIP_OPT_COMMENT]);
@@ -158,8 +158,7 @@ 
                 'size' => $statIndex['size'],
                 'compressed_size' => $statIndex['comp_size'],
                 'mtime' => $statIndex,
-                'comment' => ($comment = $this->archive->getCommentIndex
-                    ($statIndex['index']) !== false) ? $comment : null,
+                'comment' => ($comment = $this->archive->getCommentIndex($statIndex['index']) !== false) ? $comment : null,
                 'folder' => in_array(substr($statIndex['name'], -1),
                     array('/', '\\')),
                 'index' => $statIndex['index'],
@@ -189,8 +188,8 @@ 
             }
         } else {
             $options = array_combine(
-                array_filter($options, function ($v) {return (bool) $v&2;}),
-                array_filter($options, function ($v) {return (bool) ($v-1)&2;})
+                array_filter($options, function($v) {return (bool) $v & 2; }),
+                array_filter($options, function($v) {return (bool) ($v - 1) & 2; })
             );
         }
 
@@ -202,13 +201,13 @@ 
         $filters = array();
         if (isset($options[PCLZIP_OPT_REMOVE_PATH])
             && !isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            $filters[] = function(&$key, &$value) use ($options) {
              $key = str_replace($key, null, $key);
          };
         if (isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) { $key = basename($key); };
+            $filters[] = function(&$key, &$value) { $key = basename($key); };
         if (isset($options[PCLZIP_OPT_ADD_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            $filters[] = function(&$key, &$value) use ($options) {
              $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/').'/'.
                 ltrim($key, '/');
         };
@@ -216,16 +215,16 @@ 
         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; };
+        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; };
+        else $postExtractCallback = function() { return 1; };
 
         // exact matching
         if (isset($options[PCLZIP_OPT_BY_NAME]))
-            $selectFilter = function ($key, $value) use ($options) {
+            $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]);
@@ -250,21 +249,21 @@ 
         };
         // <ereg> rule
         else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg'))
-            $selectFilter = function ($key, $value) use ($options) {
+            $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) {
+            $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) {
+            $selectFilter = function($key, $value, $index) use ($options) {
                 $allowedIndexes = array();
                 foreach ($options[PCLZIP_OPT_BY_INDEX] as $rule) {
                     $parts = explode('-', $rule);
@@ -278,7 +277,7 @@ 
         };
         // no rule
         else
-            $selectFilter = function () { return self::SELECT_FILTER_PASS; };
+            $selectFilter = function() { return self::SELECT_FILTER_PASS; };
 
         if (isset($options[PCLZIP_OPT_EXTRACT_AS_STRING]))
             $anotherOutputFormat = PCLZIP_OPT_EXTRACT_AS_STRING;
@@ -470,8 +469,8 @@ 
             }
         } else {
             $options = array_combine(
-                array_filter($options, function ($v) {return (bool) $v&2;}),
-                array_filter($options, function ($v) {return (bool) ($v-1)&2;})
+                array_filter($options, function($v) {return (bool) $v & 2; }),
+                array_filter($options, function($v) {return (bool) ($v - 1) & 2; })
             );
         }
 
@@ -479,13 +478,13 @@ 
         $filters = array();
         if (isset($options[PCLZIP_OPT_REMOVE_PATH])
             && !isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            $filters[] = function(&$key, &$value) use ($options) {
                 $key = str_replace($key, null, $key);
             };
         if (isset($options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-            $filters[] = function (&$key, &$value) { $key = basename($key); };
+            $filters[] = function(&$key, &$value) { $key = basename($key); };
         if (isset($options[PCLZIP_OPT_ADD_PATH]))
-            $filters[] = function (&$key, &$value) use ($options) {
+            $filters[] = function(&$key, &$value) use ($options) {
                 $key = rtrim($options[PCLZIP_OPT_ADD_PATH], '/').'/'.
                 ltrim($key, '/');
             };
@@ -493,12 +492,12 @@ 
         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; };
+        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; };
+        else $postAddCallback = function() { return 1; };
 
         if (isset($options[PCLZIP_OPT_COMMENT]))
             $this->archive->setArchiveComment($options[PCLZIP_OPT_COMMENT]);
@@ -507,14 +506,14 @@ 
             ($comment = $this->archive->getArchiveComment() !== false)
                 ? $comment : null;
             $this->archive->setArchiveComment(
-                $comment . $options[PCLZIP_OPT_ADD_COMMENT]);
+                $comment.$options[PCLZIP_OPT_ADD_COMMENT]);
         }
         if (isset($options[PCLZIP_OPT_PREPEND_COMMENT])) {
             $comment =
             ($comment = $this->archive->getArchiveComment() !== false)
                 ? $comment : null;
             $this->archive->setArchiveComment(
-                $options[PCLZIP_OPT_PREPEND_COMMENT] . $comment);
+                $options[PCLZIP_OPT_PREPEND_COMMENT].$comment);
         }
 
 
@@ -550,13 +549,13 @@ 
         $report = array();
         $options = func_get_args();
         $options = array_combine(
-            array_filter($options, function ($v) {return (bool) $v&2;}),
-            array_filter($options, function ($v) {return (bool) ($v-1)&2;})
+            array_filter($options, function($v) {return (bool) $v & 2; }),
+            array_filter($options, function($v) {return (bool) ($v - 1) & 2; })
         );
 
         // exact matching
         if (isset($options[PCLZIP_OPT_BY_NAME]))
-            $selectFilter = function ($key, $value) use ($options) {
+            $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]);
@@ -581,21 +580,21 @@ 
             };
         // <ereg> rule
         else if (isset($options[PCLZIP_OPT_BY_EREG]) && function_exists('ereg'))
-            $selectFilter = function ($key, $value) use ($options) {
+            $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) {
+            $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) {
+            $selectFilter = function($key, $value, $index) use ($options) {
                 $allowedIndexes = array();
                 foreach ($options[PCLZIP_OPT_BY_INDEX] as $rule) {
                     $parts = explode('-', $rule);
@@ -610,7 +609,7 @@ 
             };
         // no rule
         else
-            $selectFilter = function () { return self::SELECT_FILTER_PASS; };
+            $selectFilter = function() { return self::SELECT_FILTER_PASS; };
 
         foreach ($this->listContent() as $file_header) {
             // select by select rule
@@ -690,7 +689,7 @@ 
             }
         }
 
-        call_user_func(function ($directory) {
+        call_user_func(function($directory) {
             foreach (glob($directory.'/*') as $f) {
                 if (is_dir($f)) call_user_func(__FUNCTION__, $f);
                 else unlink($f);

Braces +173 added lines, -96 removed lines

@@ -42,8 +42,11 @@ 
      */
     public function create($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();
@@ -65,29 +68,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();
@@ -118,20 +133,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
@@ -195,40 +213,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('/', '\\'))) {
@@ -249,50 +280,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) {
@@ -362,8 +407,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
@@ -455,8 +502,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();
@@ -478,30 +528,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)
@@ -555,11 +616,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('/', '\\'))) {
@@ -580,28 +642,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)
@@ -609,8 +677,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
@@ -662,8 +732,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) {
@@ -692,8 +766,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/LzwStreamWrapper.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     private static $AVERAGE_COMPRESSION_RATIO = 2;
     public static $forceTmpFile = false;
     /** High limit. unit: MBytes.
-    */
+     */
     public static $highLimit = 512;
 
     private $mode;

Braces +29 added lines, -19 removed lines

@@ -8,8 +8,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;
     }
 
@@ -40,12 +41,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);
@@ -59,14 +62,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();
@@ -75,14 +80,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;
@@ -263,7 +270,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;
         }
@@ -407,10 +416,11 @@ 
                 self::$installed = false;
             } else {
                 self::exec('command -v uncompress', $output);
-                if (empty($output))
-                    self::$installed = false;
-                else
-                    self::$installed = true;
+                if (empty($output)) {
+                                    self::$installed = false;
+                } else {
+                                    self::$installed = true;
+                }
             }
         }
     }

src/function.gzip_stat.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 {
     $fp = fopen($file, 'rb');
     if (filesize($file) < 18 || strcmp(fread($fp, 2), "\x1f\x8b")) {
-        return false;  // Not GZIP format (See RFC 1952)
+        return false; // Not GZIP format (See RFC 1952)
     }
     $method = fread($fp, 1);
     $flags = fread($fp, 1);

src/UnifiedArchive.php

Spacing +5 added lines, -5 removed lines

@@ -310,14 +310,14 @@ 
                             if (in_array($file->strd_FileId, ['.', '..']))
                                 continue;
                             $this->files[$file->Location]
-                                = $directory . $file->strd_FileId;
+                                = $directory.$file->strd_FileId;
                             $size += $file->DataLen;
 
-                            $this->isoFilesData[$directory . $file->strd_FileId] =
+                            $this->isoFilesData[$directory.$file->strd_FileId] =
                                 [
                                     'size' => $file->DataLen,
                                     'mtime' =>
-                                        strtotime((string)$file->isoRecDate),
+                                        strtotime((string) $file->isoRecDate),
                                 ];
                         }
                     }
@@ -906,8 +906,8 @@ 
                 $this->files = [];
                 foreach ($this->seven_zip->getEntries() as $entry) {
                     $this->files[] = $entry->getPath();
-                    $this->compressedFilesSize += (int)$entry->getPackedSize();
-                    $this->uncompressedFilesSize += (int)$entry->getSize();
+                    $this->compressedFilesSize += (int) $entry->getPackedSize();
+                    $this->uncompressedFilesSize += (int) $entry->getSize();
                 }
                 $this->seven_zip->numFiles = count($this->files);
                 break;

Braces +150 added lines, -85 removed lines

@@ -86,8 +86,9 @@ 
     {
         self::checkRequirements();
 
-        if (!file_exists($fileName) || !is_readable($fileName))
-            throw new Exception('Could not open file: '.$fileName);
+        if (!file_exists($fileName) || !is_readable($fileName)) {
+                    throw new Exception('Could not open file: '.$fileName);
+        }
 
         $type = self::detectArchiveType($fileName);
         if (!self::canOpenType($type, true)) {
@@ -194,8 +195,9 @@ 
                     return self::CAB;
             }
 
-            if ($type = TarArchive::detectArchiveType($fileName))
-                return $type;
+            if ($type = TarArchive::detectArchiveType($fileName)) {
+                            return $type;
+            }
         }
 
         return false;
@@ -289,8 +291,9 @@ 
 
                 $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->isoBlockSize = $usedDesc->iBlockSize;
                 $directories = $usedDesc->LoadMPathTable($this->iso);
                 foreach ($directories as $Directory) {
@@ -307,8 +310,9 @@ 
                         $usedDesc->iBlockSize, true);
                     if ($files) {
                         foreach ($files as $file) {
-                            if (in_array($file->strd_FileId, ['.', '..']))
-                                continue;
+                            if (in_array($file->strd_FileId, ['.', '..'])) {
+                                                            continue;
+                            }
                             $this->files[$file->Location]
                                 = $directory . $file->strd_FileId;
                             $size += $file->DataLen;
@@ -485,8 +489,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         switch ($this->type) {
             case self::ZIP:
@@ -517,8 +522,9 @@ 
                     true);
 
             case self::ISO:
-                if (!isset($this->isoFilesData[$fileName]))
-                    return false;
+                if (!isset($this->isoFilesData[$fileName])) {
+                                    return false;
+                }
                 $data = $this->isoFilesData[$fileName];
 
                 return new ArchiveEntry($fileName, $data['size'], $data['size'], $data['mtime'], false);
@@ -544,8 +550,9 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         switch ($this->type) {
             case self::ZIP:
@@ -560,7 +567,9 @@ 
 
             case self::RAR:
                 $entry = $this->rar->getEntry($fileName);
-                if ($entry->isDirectory()) return false;
+                if ($entry->isDirectory()) {
+                 return false;
+                }
                 return stream_get_contents($entry->getStream());
 
             case self::GZIP:
@@ -574,11 +583,14 @@ 
 
             case self::ISO:
                 $Location = array_search($fileName, $this->files, true);
-                if (!isset($this->isoFilesData[$fileName])) return false;
+                if (!isset($this->isoFilesData[$fileName])) {
+                 return false;
+                }
                 $data = $this->isoFilesData[$fileName];
                 $Location_Real = $Location * $this->isoBlockSize;
-                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']);
 
@@ -598,8 +610,9 @@ 
      */
     public function getFileResource($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         switch ($this->type) {
             case self::ZIP:
@@ -615,7 +628,9 @@ 
 
             case self::RAR:
                 $entry = $this->rar->getEntry($fileName);
-                if ($entry->isDirectory()) return false;
+                if ($entry->isDirectory()) {
+                 return false;
+                }
                 return $entry->getStream();
 
             case self::GZIP:
@@ -629,11 +644,14 @@ 
 
             case self::ISO:
                 $Location = array_search($fileName, $this->files, true);
-                if (!isset($this->isoFilesData[$fileName])) return false;
+                if (!isset($this->isoFilesData[$fileName])) {
+                 return false;
+                }
                 $data = $this->isoFilesData[$fileName];
                 $Location_Real = $Location * $this->isoBlockSize;
-                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']));
@@ -659,8 +677,9 @@ 
     {
         $tree = array(DIRECTORY_SEPARATOR);
         foreach ($this->files as $filename) {
-            if (in_array(substr($filename, -1), array('/', '\\')))
-                $tree[] = DIRECTORY_SEPARATOR.$filename;
+            if (in_array(substr($filename, -1), array('/', '\\'))) {
+                            $tree[] = DIRECTORY_SEPARATOR.$filename;
+            }
         }
 
         return $tree;
@@ -677,10 +696,13 @@ 
     public function extractFiles($outputFolder, $files = null, $expandFilesList = false)
     {
         if ($files !== null) {
-            if (is_string($files)) $files = [$files];
+            if (is_string($files)) {
+             $files = [$files];
+            }
 
-            if ($expandFilesList)
-                $files = self::expandFileList($this->files, $files);
+            if ($expandFilesList) {
+                            $files = self::expandFileList($this->files, $files);
+            }
         } else {
             $files = array_values($this->files);
         }
@@ -688,19 +710,22 @@ 
         switch ($this->type) {
             case self::ZIP:
                 if (count($files) === count($this->files)) {
-                    if ($this->zip->extractTo($outputFolder) === false)
-                        throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                    if ($this->zip->extractTo($outputFolder) === false) {
+                                            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                    }
                     return $this->zip->numFiles;
                 } else {
-                    if ($this->zip->extractTo($outputFolder, $files) === false)
-                        throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                    if ($this->zip->extractTo($outputFolder, $files) === false) {
+                                            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                    }
 
                     return count($files);
                 }
 
             case self::SEVEN_ZIP:
-                if (!is_dir($outputFolder))
-                    mkdir($outputFolder);
+                if (!is_dir($outputFolder)) {
+                                    mkdir($outputFolder);
+                }
 
                 $this->seven_zip->setOutputDirectory($outputFolder);
                 $count = 0;
@@ -710,8 +735,9 @@ 
                         return $this->seven_zip->numFiles;
                     } else {
                         foreach ($files as $file) {
-                            if ($this->seven_zip->extractEntry($file))
-                                $count++;
+                            if ($this->seven_zip->extractEntry($file)) {
+                                                            $count++;
+                            }
                         }
                         return $count;
                     }
@@ -732,28 +758,33 @@ 
             case self::GZIP:
             case self::BZIP:
             case self::LZMA:
-                if ($files !== null && $files !== $this->files)
-                    return 0;
+                if ($files !== null && $files !== $this->files) {
+                                    return 0;
+                }
 
                 $dir = rtrim($outputFolder, '/').'/';
-                if (!is_dir($dir) && !mkdir($dir))
-                    return false;
+                if (!is_dir($dir) && !mkdir($dir)) {
+                                    return false;
+                }
 
                 switch ($this->type) {
                     case self::GZIP:
                         $data = gzdecode(file_get_contents($this->gzipFilename));
-                        if ($data === false)
-                            throw new Exception('Could not extract archive');
+                        if ($data === false) {
+                                                    throw new Exception('Could not extract archive');
+                        }
                         break;
                     case self::BZIP:
                         $data = bzdecompress(file_get_contents($this->bzipFilename));
-                        if (is_integer($data))
-                            throw new Exception('Could not extract archive', $data);
+                        if (is_integer($data)) {
+                                                    throw new Exception('Could not extract archive', $data);
+                        }
                         break;
                     case self::LZMA:
                         $fp = xzopen($this->lzmaFilename, 'r');
-                        if ($fp === false)
-                            throw new Exception('Could not extract archive');
+                        if ($fp === false) {
+                                                    throw new Exception('Could not extract archive');
+                        }
                         ob_start();
                         xzpassthru($fp);
                         $data = ob_get_flush();
@@ -761,8 +792,9 @@ 
                         break;
                 }
 
-                if (file_put_contents($dir.$this->files[0], $data) !== false)
-                    return 1;
+                if (file_put_contents($dir.$this->files[0], $data) !== false) {
+                                    return 1;
+                }
 
                 return false;
 
@@ -782,12 +814,15 @@ 
      */
     public function deleteFiles($fileOrFiles, $expandFilesList = false)
     {
-        if ($expandFilesList && $fileOrFiles !== null)
-            $fileOrFiles = self::expandFileList($this->files, is_string($fileOrFiles) ? [$fileOrFiles] : $fileOrFiles);
+        if ($expandFilesList && $fileOrFiles !== null) {
+                    $fileOrFiles = self::expandFileList($this->files, is_string($fileOrFiles) ? [$fileOrFiles] : $fileOrFiles);
+        }
 
         $files = is_string($fileOrFiles) ? array($fileOrFiles) : $fileOrFiles;
         foreach ($files as $i => $file) {
-            if (!in_array($file, $this->files, true)) unset($files[$i]);
+            if (!in_array($file, $this->files, true)) {
+             unset($files[$i]);
+            }
         }
 
         $count = 0;
@@ -797,8 +832,9 @@ 
                 $count = 0;
                 foreach ($files as $file) {
                     $index = array_search($file, $this->files, true);
-                    if ($this->zip->deleteIndex($index) === false)
-                        throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                    if ($this->zip->deleteIndex($index) === false) {
+                                            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                    }
                     $count++;
                 }
             break;
@@ -843,11 +879,13 @@ 
             case self::ZIP:
                 foreach ($files_list as $localname => $filename) {
                     if (is_null($filename)) {
-                        if ($this->zip->addEmptyDir($localname) === false)
-                            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                        if ($this->zip->addEmptyDir($localname) === false) {
+                                                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                        }
                     } else {
-                        if ($this->zip->addFile($filename, $localname) === false)
-                            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                        if ($this->zip->addFile($filename, $localname) === false) {
+                                                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                        }
                         $added_files++;
                     }
                 }
@@ -924,23 +962,28 @@ 
      */
     public static function archiveFiles($fileOrFiles, $archiveName, $emulate = false)
     {
-        if (file_exists($archiveName))
-            throw new Exception('Archive '.$archiveName.' already exists!');
+        if (file_exists($archiveName)) {
+                    throw new Exception('Archive '.$archiveName.' already exists!');
+        }
 
         self::checkRequirements();
 
         $atype = self::detectArchiveType($archiveName, false);
-        if (in_array($atype, [TarArchive::TAR, TarArchive::TAR_GZIP, TarArchive::TAR_BZIP, TarArchive::TAR_LZMA, TarArchive::TAR_LZW], true))
-            return TarArchive::archiveFiles($fileOrFiles, $archiveName, $emulate);
-        if ($atype === false)
-            return false;
+        if (in_array($atype, [TarArchive::TAR, TarArchive::TAR_GZIP, TarArchive::TAR_BZIP, TarArchive::TAR_LZMA, TarArchive::TAR_LZW], true)) {
+                    return TarArchive::archiveFiles($fileOrFiles, $archiveName, $emulate);
+        }
+        if ($atype === false) {
+                    return false;
+        }
 
         $files_list = self::createFilesList($fileOrFiles);
 
         // fake creation: return archive data
         if ($emulate) {
             $totalSize = 0;
-            foreach ($files_list as $fn) $totalSize += filesize($fn);
+            foreach ($files_list as $fn) {
+             $totalSize += filesize($fn);
+            }
 
             return array(
                 'totalSize' => $totalSize,
@@ -954,15 +997,18 @@ 
             case self::ZIP:
                 $zip = new ZipArchive;
                 $result = $zip->open($archiveName, ZipArchive::CREATE);
-                if ($result !== true)
-                    throw new Exception('ZipArchive error: '.$result);
+                if ($result !== true) {
+                                    throw new Exception('ZipArchive error: '.$result);
+                }
                 foreach ($files_list as $localname => $filename) {
                     if ($filename === null) {
-                        if ($zip->addEmptyDir($localname) === false)
-                            return false;
+                        if ($zip->addEmptyDir($localname) === false) {
+                                                    return false;
+                        }
                     } else {
-                        if ($zip->addFile($filename, $localname) === false)
-                            return false;
+                        if ($zip->addFile($filename, $localname) === false) {
+                                                    return false;
+                        }
                     }
                 }
                 $zip->close();
@@ -986,34 +1032,52 @@ 
                 return count($files_list);
 
             case self::GZIP:
-                if (count($files_list) > 1) return false;
+                if (count($files_list) > 1) {
+                 return false;
+                }
                 $filename = array_shift($files_list);
-                if (is_null($filename)) return false; // invalid list
+                if (is_null($filename)) {
+                 return false;
+                }
+                // invalid list
                 if (file_put_contents($archiveName,
-                        gzencode(file_get_contents($filename))) !== false)
-                    return 1;
+                        gzencode(file_get_contents($filename))) !== false) {
+                                    return 1;
+                }
 
                 return false;
 
             case self::BZIP:
-                if (count($files_list) > 1) return false;
+                if (count($files_list) > 1) {
+                 return false;
+                }
                 $filename = array_shift($files_list);
-                if (is_null($filename)) return false; // invalid list
+                if (is_null($filename)) {
+                 return false;
+                }
+                // invalid list
                 if (file_put_contents($archiveName,
-                        bzcompress(file_get_contents($filename))) !== false)
-                    return 1;
+                        bzcompress(file_get_contents($filename))) !== false) {
+                                    return 1;
+                }
 
                 return false;
 
             case self::LZMA:
-                if (count($files_list) > 1) return false;
+                if (count($files_list) > 1) {
+                 return false;
+                }
                 $filename = array_shift($files_list);
-                if (is_null($filename)) return false; // invalid list
+                if (is_null($filename)) {
+                 return false;
+                }
+                // invalid list
                 $fp = xzopen($archiveName, 'w');
                 $r = xzwrite($fp, file_get_contents($filename));
                 xzclose($fp);
-                if ($r !== false)
-                    return 1;
+                if ($r !== false) {
+                                    return 1;
+                }
 
                 return false;
 
@@ -1037,8 +1101,9 @@ 
             self::$enabledTypes[self::ISO] = class_exists('\CISOFile');
             self::$enabledTypes[self::CAB] = class_exists('\CabArchive');
 
-            if (class_exists('\RarException'))
-                \RarException::setUsingExceptions(true);
+            if (class_exists('\RarException')) {
+                            \RarException::setUsingExceptions(true);
+            }
         }
     }
 }

src/CamApplication.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 
         if (!empty($not_installed)) {
             echo 'Not supported archive types:'.PHP_EOL;
-            array_walk($not_installed, function ($instruction, $extension) {
+            array_walk($not_installed, function($instruction, $extension) {
                 echo '- '.$extension.': '.$instruction.PHP_EOL;
             });
         }
@@ -289,7 +289,7 @@ 
             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;
+                echo 'Created archive '.$args['ARCHIVE'].' with '.$archived_files.' file(s) of total size '.implode('', $this->formatSize(filesize($args['ARCHIVE']))).PHP_EOL;
         }
     }
 }

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

Spacing +62 added lines, -62 removed lines

@@ -3,7 +3,7 @@ 
 
   // ----- Constants
   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
   }
 
   // ----- File list separator
@@ -17,7 +17,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+    define('PCLZIP_SEPARATOR', ',');
   }
 
   // ----- Error configuration
@@ -26,7 +26,7 @@ 
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
   if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+    define('PCLZIP_ERROR_EXTERNAL', 0);
   }
 
   // ----- Optional static temporary directory
@@ -39,7 +39,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
   if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', sys_get_temp_dir());
+    define('PCLZIP_TEMPORARY_DIR', sys_get_temp_dir());
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -51,75 +51,75 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
   }
 
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+  define('PCLZIP_ERR_USER_ABORTED', 2);
+  define('PCLZIP_ERR_NO_ERROR', 0);
+  define('PCLZIP_ERR_WRITE_OPEN_FAIL', -1);
+  define('PCLZIP_ERR_READ_OPEN_FAIL', -2);
+  define('PCLZIP_ERR_INVALID_PARAMETER', -3);
+  define('PCLZIP_ERR_MISSING_FILE', -4);
+  define('PCLZIP_ERR_FILENAME_TOO_LONG', -5);
+  define('PCLZIP_ERR_INVALID_ZIP', -6);
+  define('PCLZIP_ERR_BAD_EXTRACTED_FILE', -7);
+  define('PCLZIP_ERR_DIR_CREATE_FAIL', -8);
+  define('PCLZIP_ERR_BAD_EXTENSION', -9);
+  define('PCLZIP_ERR_BAD_FORMAT', -10);
+  define('PCLZIP_ERR_DELETE_FILE_FAIL', -11);
+  define('PCLZIP_ERR_RENAME_FILE_FAIL', -12);
+  define('PCLZIP_ERR_BAD_CHECKSUM', -13);
+  define('PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+  define('PCLZIP_ERR_MISSING_OPTION_VALUE', -15);
+  define('PCLZIP_ERR_INVALID_OPTION_VALUE', -16);
+  define('PCLZIP_ERR_ALREADY_A_DIRECTORY', -17);
+  define('PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18);
+  define('PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19);
+  define('PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20);
+  define('PCLZIP_ERR_DIRECTORY_RESTRICTION', -21);
 
   // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+  define('PCLZIP_OPT_PATH', 77001);
+  define('PCLZIP_OPT_ADD_PATH', 77002);
+  define('PCLZIP_OPT_REMOVE_PATH', 77003);
+  define('PCLZIP_OPT_REMOVE_ALL_PATH', 77004);
+  define('PCLZIP_OPT_SET_CHMOD', 77005);
+  define('PCLZIP_OPT_EXTRACT_AS_STRING', 77006);
+  define('PCLZIP_OPT_NO_COMPRESSION', 77007);
+  define('PCLZIP_OPT_BY_NAME', 77008);
+  define('PCLZIP_OPT_BY_INDEX', 77009);
+  define('PCLZIP_OPT_BY_EREG', 77010);
+  define('PCLZIP_OPT_BY_PREG', 77011);
+  define('PCLZIP_OPT_COMMENT', 77012);
+  define('PCLZIP_OPT_ADD_COMMENT', 77013);
+  define('PCLZIP_OPT_PREPEND_COMMENT', 77014);
+  define('PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015);
+  define('PCLZIP_OPT_REPLACE_NEWER', 77016);
+  define('PCLZIP_OPT_STOP_ON_ERROR', 77017);
   // Having big trouble with crypt. Need to multiply 2 long int
   // which is not correctly supported by PHP ...
   //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+  define('PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019);
+  define('PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020); // alias
+  define('PCLZIP_OPT_TEMP_FILE_ON', 77021);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021); // alias
+  define('PCLZIP_OPT_TEMP_FILE_OFF', 77022);
+  define('PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022); // alias
 
   // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+  define('PCLZIP_ATT_FILE_NAME', 79001);
+  define('PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002);
+  define('PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003);
+  define('PCLZIP_ATT_FILE_MTIME', 79004);
+  define('PCLZIP_ATT_FILE_CONTENT', 79005);
+  define('PCLZIP_ATT_FILE_COMMENT', 79006);
 
   // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
+  define('PCLZIP_CB_PRE_EXTRACT', 78001);
+  define('PCLZIP_CB_POST_EXTRACT', 78002);
+  define('PCLZIP_CB_PRE_ADD', 78003);
+  define('PCLZIP_CB_POST_ADD', 78004);
 
 interface PclZipOriginalInterface
 {

src/BasicArchive.php

Braces +31 added lines, -22 removed lines

@@ -38,8 +38,9 @@ 
         $newFiles = [];
         foreach ($files as $file) {
             foreach ($archiveFiles as $archiveFile) {
-                if (fnmatch($file.'*', $archiveFile))
-                    $newFiles[] = $archiveFile;
+                if (fnmatch($file.'*', $archiveFile)) {
+                                    $newFiles[] = $archiveFile;
+                }
             }
         }
         return $newFiles;
@@ -56,26 +57,29 @@ 
         // passed an extended list
         if (is_array($nodes)) {
             foreach ($nodes as $source => $destination) {
-                if (is_numeric($source))
-                    $source = $destination;
+                if (is_numeric($source)) {
+                                    $source = $destination;
+                }
 
                 $destination = rtrim($destination, '/\\*');
 
                 // if is directory
-                if (is_dir($source))
-                    self::importFilesFromDir(rtrim($source, '/\\*').'/*',
+                if (is_dir($source)) {
+                                    self::importFilesFromDir(rtrim($source, '/\\*').'/*',
                         !empty($destination) ? $destination.'/' : null, true, $files);
-                else if (is_file($source))
-                    $files[$destination] = $source;
+                } else if (is_file($source)) {
+                                    $files[$destination] = $source;
+                }
             }
 
         } else if (is_string($nodes)) { // passed one file or directory
             // if is directory
-            if (is_dir($nodes))
-                self::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
+            if (is_dir($nodes)) {
+                            self::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
                     $files);
-            else if (is_file($nodes))
-                $files[basename($nodes)] = $nodes;
+            } else if (is_file($nodes)) {
+                            $files[basename($nodes)] = $nodes;
+            }
         }
 
         return $files;
@@ -92,8 +96,9 @@ 
         // $map[$destination] = rtrim($source, '/*');
         // do not map root archive folder
 
-        if ($destination !== null)
-            $map[$destination] = null;
+        if ($destination !== null) {
+                    $map[$destination] = null;
+        }
 
         foreach (glob($source, GLOB_MARK) as $node) {
             if (in_array(substr($node, -1), ['/', '\\'], true) && $recursive) {
@@ -112,8 +117,9 @@ 
      */
     static public function archiveFile($file, $archiveName)
     {
-        if (!is_file($file))
-            throw new \InvalidArgumentException($file.' is not a valid file to archive');
+        if (!is_file($file)) {
+                    throw new \InvalidArgumentException($file.' is not a valid file to archive');
+        }
 
         return static::archiveFiles($file, $archiveName) === 1;
     }
@@ -125,8 +131,9 @@ 
      */
     static public function archiveDirectory($directory, $archiveName)
     {
-        if (!is_dir($directory) || !is_readable($directory))
-            throw new \InvalidArgumentException($directory.' is not a valid directory to archive');
+        if (!is_dir($directory) || !is_readable($directory)) {
+                    throw new \InvalidArgumentException($directory.' is not a valid directory to archive');
+        }
 
         return static::archiveFiles($directory, $archiveName) > 0;
     }
@@ -138,8 +145,9 @@ 
      */
     public function addFile($file, $inArchiveName = null)
     {
-        if (!is_file($file))
-            throw new \InvalidArgumentException($file.' is not a valid file to add in archive');
+        if (!is_file($file)) {
+                    throw new \InvalidArgumentException($file.' is not a valid file to add in archive');
+        }
 
         return ($inArchiveName !== null
             ? $this->addFiles([$file => $inArchiveName])
@@ -153,8 +161,9 @@ 
      */
     public function addDirectory($directory, $inArchivePath = null)
     {
-        if (!is_dir($directory) || !is_readable($directory))
-            throw new \InvalidArgumentException($directory.' is not a valid directory to add in archive');
+        if (!is_dir($directory) || !is_readable($directory)) {
+                    throw new \InvalidArgumentException($directory.' is not a valid directory to add in archive');
+        }
 
         return ($inArchivePath !== null
                 ? $this->addFiles([$directory => $inArchivePath])