wapmorgan / UnifiedArchive

src/UnifiedArchive.php

Braces +70 added lines, -46 removed lines

@@ -76,8 +76,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)) {
@@ -220,8 +221,9 @@ 
         $this->type = $type;
         $this->archiveSize = filesize($fileName);
 
-        if (!isset(static::$formatHandlers[$type]))
-            throw new Exception('Unsupported archive type: '.$type.' of archive '.$fileName);
+        if (!isset(static::$formatHandlers[$type])) {
+                    throw new Exception('Unsupported archive type: '.$type.' of archive '.$fileName);
+        }
 
         $handler_class = __NAMESPACE__.'\\Formats\\'.static::$formatHandlers[$type];
 
@@ -259,8 +261,9 @@ 
      */
     public function getPclZipInterface()
     {
-        if ($this->type !== self::ZIP)
-            throw new UnsupportedOperationException();
+        if ($this->type !== self::ZIP) {
+                    throw new UnsupportedOperationException();
+        }
 
         return new $this->archive->getPclZip();
     }
@@ -336,8 +339,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         return $this->archive->getFileData($fileName);
     }
@@ -352,8 +356,9 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         return $this->archive->getFileContent($fileName);
     }
@@ -365,8 +370,9 @@ 
      */
     public function getFileResource($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         return $this->archive->getFileResource($fileName);
     }
@@ -382,10 +388,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);
+            }
 
             return $this->archive->extractFiles($outputFolder, $files);
         } else {
@@ -406,8 +415,9 @@ 
     {
         $fileOrFiles = is_string($fileOrFiles) ? [$fileOrFiles] : $fileOrFiles;
 
-        if ($expandFilesList && $fileOrFiles !== null)
-            $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        if ($expandFilesList && $fileOrFiles !== null) {
+                    $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        }
 
         $result = $this->archive->deleteFiles($fileOrFiles);
         $this->scanArchive();
@@ -437,8 +447,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])
@@ -454,8 +465,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])
@@ -491,23 +503,27 @@ 
      */
     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();
 
         $archiveType = self::detectArchiveType($archiveName, false);
         //        if (in_array($archiveType, [TarArchive::TAR, TarArchive::TAR_GZIP, TarArchive::TAR_BZIP, TarArchive::TAR_LZMA, TarArchive::TAR_LZW], true))
         //            return TarArchive::archiveFiles($fileOrFiles, $archiveName, $emulate);
-        if ($archiveType === false)
-            return false;
+        if ($archiveType === 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,
@@ -517,8 +533,9 @@ 
             );
         }
 
-        if (!isset(static::$formatHandlers[$archiveType]))
-            throw new Exception('Unsupported archive type: '.$archiveType.' of archive '.$archiveName);
+        if (!isset(static::$formatHandlers[$archiveType])) {
+                    throw new Exception('Unsupported archive type: '.$archiveType.' of archive '.$archiveName);
+        }
 
         $handler_class = __NAMESPACE__.'\\Formats\\'.static::$formatHandlers[$archiveType];
 
@@ -534,8 +551,9 @@ 
      */
     public static 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;
     }
@@ -549,8 +567,9 @@ 
      */
     public static 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;
     }
@@ -616,8 +635,9 @@ 
         $newFiles = [];
         foreach ($files as $file) {
             foreach ($archiveFiles as $archiveFile) {
-                if (fnmatch($file.'*', $archiveFile))
-                    $newFiles[] = $archiveFile;
+                if (fnmatch($file.'*', $archiveFile)) {
+                                    $newFiles[] = $archiveFile;
+                }
             }
         }
         return $newFiles;
@@ -634,26 +654,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;
@@ -670,8 +693,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) {

src/PclzipZipInterface.php

Spacing +37 added lines, -38 removed lines

@@ -147,8 +147,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; })
             );
         }
 
@@ -156,12 +156,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, '/');
             };
@@ -169,12 +169,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]);
@@ -248,8 +248,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'],
@@ -279,8 +278,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; })
             );
         }
 
@@ -292,13 +291,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, '/');
             };
@@ -306,16 +305,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]);
@@ -340,21 +339,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);
@@ -368,7 +367,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;
@@ -560,8 +559,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; })
             );
         }
 
@@ -569,13 +568,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, '/');
             };
@@ -583,12 +582,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]);
@@ -597,14 +596,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);
         }
 
 
@@ -640,13 +639,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]);
@@ -671,21 +670,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);
@@ -700,7 +699,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
@@ -780,7 +779,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

@@ -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);