wapmorgan / UnifiedArchive

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

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;

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:

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);
     }
 
     /**

src/Formats/SevenZip.php

Spacing +2 added lines, -2 removed lines

@@ -139,8 +139,8 @@
             $information->files[] = $can_get_unix_path
                 ? $entry->getUnixPath()
                 : str_replace('\\', '/', $entry->getPath());
-            $information->compressedFilesSize += (int)$entry->getPackedSize();
-            $information->uncompressedFilesSize += (int)$entry->getSize();
+            $information->compressedFilesSize += (int) $entry->getPackedSize();
+            $information->uncompressedFilesSize += (int) $entry->getSize();
         }
         return $information;
     }

src/Formats/OneFile/Gzip.php

Spacing +1 added lines, -1 removed lines

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

src/Formats/OneFile/Lzma.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  */
 class Lzma extends OneFileDriver
 {
-    const FORMAT_SUFFIX =  'xz';
+    const FORMAT_SUFFIX = 'xz';
 
     /**
      * @return array

src/Formats/OneFile/Bzip.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 
 class Bzip extends OneFileDriver
 {
-    const FORMAT_SUFFIX =  'bz2';
+    const FORMAT_SUFFIX = 'bz2';
 
     /**
      * @return array

src/Formats/Zip.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
     public static function getDescription()
     {
-        return 'adapter for ext-zip'.(extension_loaded('zip') && defined('\ZipArchive::LIBZIP_VERSION') ? ' ('. ZipArchive::LIBZIP_VERSION.')' : null);
+        return 'adapter for ext-zip'.(extension_loaded('zip') && defined('\ZipArchive::LIBZIP_VERSION') ? ' ('.ZipArchive::LIBZIP_VERSION.')' : null);
     }
 
     public static function getInstallationInstruction()