wapmorgan / UnifiedArchive

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 +24 added lines, -15 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -237,8 +237,8 @@
                 if ($code == 0 || $code == 2 || is_null($code)) {
                     // rewrite original file
                     if (rename($this->tmp2, $this->path) !== true) {
-                        throw new \RuntimeException(__FILE__ . ', line ' . __LINE__ .
-                            ': Could not replace original file ' . $this->path);
+                        throw new \RuntimeException(__FILE__.', line '.__LINE__.
+                            ': Could not replace original file '.$this->path);
                     }
                 } else {
                     throw new \RuntimeException(__FILE__.', line '.__LINE__.

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

src/Formats.php

Braces +15 added lines, -10 removed lines

@@ -258,12 +258,14 @@ 
     {
 
         static::retrieveAllFormats();
-        if (!static::canOpen($format))
-            return false;
+        if (!static::canOpen($format)) {
+                    return false;
+        }
 
         foreach (static::$formatsSupport[$format] as $driver) {
-            if ($driver::$function($format))
-                return true;
+            if ($driver::$function($format)) {
+                            return true;
+            }
         }
 
         return false;
@@ -278,15 +280,18 @@ 
     {
         static::retrieveAllFormats();
 
-        if (!static::canOpen($format))
-            throw new UnsupportedArchiveException('Unsupported archive type: '.$format.' of archive ');
+        if (!static::canOpen($format)) {
+                    throw new UnsupportedArchiveException('Unsupported archive type: '.$format.' of archive ');
+        }
 
-        if (!$createAbility)
-            return current(static::$formatsSupport[$format]);
+        if (!$createAbility) {
+                    return current(static::$formatsSupport[$format]);
+        }
 
         foreach (static::$formatsSupport[$format] as $driver) {
-            if ($driver::canCreateArchive($format))
-                return $driver;
+            if ($driver::canCreateArchive($format)) {
+                            return $driver;
+            }
         }
         return false;
     }

src/UnifiedArchive.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
     public static function open($fileName, $password = null)
     {
         if (!file_exists($fileName) || !is_readable($fileName)) {
-            throw new InvalidArgumentException('Could not open file: ' . $fileName);
+            throw new InvalidArgumentException('Could not open file: '.$fileName);
         }
 
         $format = Formats::detectArchiveFormat($fileName);
@@ -214,7 +214,7 @@ 
     public function getFileData($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileData($fileName);
@@ -230,7 +230,7 @@ 
     public function getFileContent($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileContent($fileName);
@@ -246,7 +246,7 @@ 
     public function getFileStream($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileStream($fileName);
@@ -501,7 +501,7 @@ 
     public static function archiveFile($file, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE)
     {
         if (!is_file($file)) {
-            throw new InvalidArgumentException($file . ' is not a valid file to archive');
+            throw new InvalidArgumentException($file.' is not a valid file to archive');
         }
 
         return static::archiveFiles($file, $archiveName, $compressionLevel) === 1;

Braces +43 added lines, -30 removed lines

@@ -326,8 +326,9 @@ 
     {
         $files_list = static::createFilesList($fileOrFiles);
 
-        if (empty($files_list))
-            throw new EmptyFileListException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new EmptyFileListException('Files list is empty!');
+        }
 
         $result = $this->archive->addFiles($files_list);
         $this->scanArchive();
@@ -346,8 +347,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([$inArchiveName => $file])
@@ -380,8 +382,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([$inArchivePath => $directory])
@@ -421,13 +424,15 @@ 
     {
         $archiveType = Formats::detectArchiveFormat($archiveName, false);
 
-        if ($archiveType === false)
-            throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
+        if ($archiveType === false) {
+                    throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
+        }
 
         $files_list = static::createFilesList($fileOrFiles);
 
-        if (empty($files_list))
-            throw new EmptyFileListException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new EmptyFileListException('Files list is empty!');
+        }
 
         $totalSize = 0;
         foreach ($files_list as $fn) {
@@ -471,16 +476,19 @@ 
      */
     public static function archiveFiles($fileOrFiles, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE, $password = null)
     {
-        if (file_exists($archiveName))
-            throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
+        if (file_exists($archiveName)) {
+                    throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
+        }
 
         $info = static::prepareForArchiving($fileOrFiles, $archiveName);
 
-        if (!Formats::canCreate($info['type']))
-            throw new UnsupportedArchiveException('Unsupported archive type: '.$info['type'].' of archive '.$archiveName);
+        if (!Formats::canCreate($info['type'])) {
+                    throw new UnsupportedArchiveException('Unsupported archive type: '.$info['type'].' of archive '.$archiveName);
+        }
 
-        if ($password !== null && !Formats::canEncrypt($info['type']))
-            throw new UnsupportedOperationException('Archive type '.$info['type'].' can not be encrypted');
+        if ($password !== null && !Formats::canEncrypt($info['type'])) {
+                    throw new UnsupportedOperationException('Archive type '.$info['type'].' can not be encrypted');
+        }
 
         /** @var BasicDriver $handler_class */
         $driver = Formats::getFormatDriver($info['type'], true);
@@ -519,8 +527,9 @@ 
      */
     public static function archiveDirectory($directory, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE)
     {
-        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;
     }
@@ -555,26 +564,29 @@ 
         // passed an extended list
         if (is_array($nodes)) {
             foreach ($nodes as $destination => $source) {
-                if (is_numeric($destination))
-                    $destination = $source;
+                if (is_numeric($destination)) {
+                                    $destination = $source;
+                }
 
                 $destination = rtrim($destination, '/\\*');
 
                 // if is directory
-                if (is_dir($source))
-                    static::importFilesFromDir(rtrim($source, '/\\*').'/*',
+                if (is_dir($source)) {
+                                    static::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))
-                static::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
+            if (is_dir($nodes)) {
+                            static::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;
@@ -591,8 +603,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/Formats/Rar.php

Braces +12 added lines, -4 removed lines

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

src/Formats/Cab.php

Braces +3 added lines, -2 removed lines

@@ -60,8 +60,9 @@
      */
     public function __construct($archiveFileName, $format, $password = null)
     {
-        if ($password !== null)
-            throw new UnsupportedOperationException('Cab archive does not support password!');
+        if ($password !== null) {
+                    throw new UnsupportedOperationException('Cab archive does not support password!');
+        }
         $this->open($archiveFileName);
     }
 

src/Formats/TarByPear.php

Spacing +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
                 $compression = 'lzma2';
                 break;
             case 'z':
-                $tar_aname = 'compress.lzw://' . $archiveFileName;
+                $tar_aname = 'compress.lzw://'.$archiveFileName;
                 break;
         }
 
@@ -171,7 +171,7 @@ 
 
             case Formats::TAR_LZW:
                 LzwStreamWrapper::registerWrapper();
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->archiveFileName);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->archiveFileName);
                 break;
 
             default:

Braces +26 added lines, -18 removed lines

@@ -123,21 +123,24 @@ 
                 break;
         }
 
-        if (isset($tar_aname))
-            $tar = new Archive_Tar($tar_aname, $compression);
-        else
-            $tar = new Archive_Tar($archiveFileName, $compression);
+        if (isset($tar_aname)) {
+                    $tar = new Archive_Tar($tar_aname, $compression);
+        } else {
+                    $tar = new Archive_Tar($archiveFileName, $compression);
+        }
 
         foreach ($files  as $localName => $filename) {
             $remove_dir = dirname($filename);
             $add_dir = dirname($localName);
 
             if (is_null($filename)) {
-                if ($tar->addString($localName, '') === false)
-                    throw new ArchiveCreationException('Error when adding directory '.$localName.' to archive');
+                if ($tar->addString($localName, '') === false) {
+                                    throw new ArchiveCreationException('Error when adding directory '.$localName.' to archive');
+                }
             } else {
-                if ($tar->addModify($filename, $add_dir, $remove_dir) === false)
-                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                if ($tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                }
             }
         }
         $tar = null;
@@ -194,8 +197,9 @@ 
                 continue;
             }
             // skip directories
-            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/')
-                continue;
+            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/') {
+                            continue;
+            }
             $information->files[] = $file['filename'];
             $information->uncompressedFilesSize += $file['size'];
             $this->pearFilesIndex[$file['filename']] = $i;
@@ -240,14 +244,16 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         $index = $this->pearFilesIndex[$fileName];
 
         $files_list = $this->tar->listContent();
-        if (!isset($files_list[$index]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        if (!isset($files_list[$index])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        }
 
         $data = $files_list[$index];
         unset($files_list);
@@ -262,8 +268,9 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return $this->tar->extractInString($fileName);
     }
@@ -273,8 +280,9 @@ 
      */
     public function getFileStream($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return self::wrapStringInStream($this->tar->extractInString($fileName));
     }

src/Formats/TarByPhar.php

Braces +3 added lines, -2 removed lines

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

src/Formats/Iso.php

Spacing +3 added lines, -3 removed lines

@@ -120,11 +120,11 @@ 
                     $this->files[$file->Location] = $directory.$file->strd_FileId;
                     $this->filesSize += $file->DataLen;
 
-                    $this->filesData[$directory . $file->strd_FileId] =
+                    $this->filesData[$directory.$file->strd_FileId] =
                         [
                             'size' => $file->DataLen,
                             'mtime' =>
-                                strtotime((string)$file->isoRecDate),
+                                strtotime((string) $file->isoRecDate),
                         ];
                 }
             }
@@ -172,7 +172,7 @@ 
             return false;
 
         return new ArchiveEntry($fileName, $this->filesData[$fileName]['size'],
-            $this->filesData[$fileName]['size'], $this->filesData[$fileName]['mtime'],false);
+            $this->filesData[$fileName]['size'], $this->filesData[$fileName]['mtime'], false);
     }
 
     /**

Braces +18 added lines, -11 removed lines

@@ -69,8 +69,9 @@ 
     public function __construct($archiveFileName, $format, $password = null)
     {
         $this->open($archiveFileName);
-        if ($password !== null)
-            throw new UnsupportedOperationException('Iso archive does not support password!');
+        if ($password !== null) {
+                    throw new UnsupportedOperationException('Iso archive does not support password!');
+        }
     }
 
     /**
@@ -93,8 +94,9 @@ 
 
         /** @var \CVolumeDescriptor $usedDesc */
         $usedDesc = $this->iso->GetDescriptor(SUPPLEMENTARY_VOLUME_DESC);
-        if (!$usedDesc)
-            $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        if (!$usedDesc) {
+                    $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        }
         $this->blockSize = $usedDesc->iBlockSize;
         $directories = $usedDesc->LoadMPathTable($this->iso);
         // iterate over all directories
@@ -115,8 +117,9 @@ 
             if ($files) {
                 /** @var \CFileDirDescriptors $file */
                 foreach ($files as $file) {
-                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory())
-                        continue;
+                    if (in_array($file->strd_FileId, ['.', '..']) || $file->IsDirectory()) {
+                                            continue;
+                    }
                     $this->files[$file->Location] = $directory.$file->strd_FileId;
                     $this->filesSize += $file->DataLen;
 
@@ -168,8 +171,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->filesData[$fileName]))
-            return false;
+        if (!isset($this->filesData[$fileName])) {
+                    return false;
+        }
 
         return new ArchiveEntry($fileName, $this->filesData[$fileName]['size'],
             $this->filesData[$fileName]['size'], $this->filesData[$fileName]['mtime'],false);
@@ -204,11 +208,14 @@ 
     protected function prepareForFileExtracting($fileName)
     {
         $Location = array_search($fileName, $this->files, true);
-        if (!isset($this->filesData[$fileName])) return false;
+        if (!isset($this->filesData[$fileName])) {
+         return false;
+        }
         $data = $this->filesData[$fileName];
         $Location_Real = $Location * $this->blockSize;
-        if ($this->iso->Seek($Location_Real, SEEK_SET) === false)
-            return false;
+        if ($this->iso->Seek($Location_Real, SEEK_SET) === false) {
+                    return false;
+        }
         return $data;
     }