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

Braces +7 added lines, -6 removed lines

@@ -10,13 +10,13 @@ 
      */
     public static function getBinaryVersion()
     {
-        if (method_exists(__CLASS__, 'makeBinary7z'))
-            try {
+        if (method_exists(__CLASS__, 'makeBinary7z')) {
+                    try {
                 $binary = static::makeBinary7z();
+        }
             } catch (\Exception $e) {
                 return false;
-            }
-        else {
+            } else {
             // some hack for gemorroj/archive7z 4.x version
             try {
                 $seven_zip = new self(null);
@@ -29,8 +29,9 @@ 
 
         $process = new Process([str_replace('\\', '/', $binary)]);
         $result = $process->mustRun()->getOutput();
-        if (!preg_match('~7-Zip (\([a-z]\) )?(\[[\d]+\] )?(?<version>\d+\.\d+)~i', $result, $version))
-            return false;
+        if (!preg_match('~7-Zip (\([a-z]\) )?(\[[\d]+\] )?(?<version>\d+\.\d+)~i', $result, $version)) {
+                    return false;
+        }
 
         return $version['version'];
     }

src/Drivers/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;

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
      */
     public function getFileStream($fileName)
     {
-        return fopen('phar://'.$this->archiveFileName . '/' . $fileName, 'rb');
+        return fopen('phar://'.$this->archiveFileName.'/'.$fileName, 'rb');
     }
 
     /**

src/Drivers/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/Drivers/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;
     }
 

src/Drivers/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();
     }
 

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
      */
     public static function getDescription()
     {
-        return 'adapter for ext-rar' . (extension_loaded('rar') ? ' (' . phpversion('rar') . ')' : null);
+        return 'adapter for ext-rar'.(extension_loaded('rar') ? ' ('.phpversion('rar').')' : null);
     }
 
     /**
@@ -60,7 +60,7 @@ 
     public static function getInstallationInstruction()
     {
         return !extension_loaded('rar')
-            ? 'install [rar] extension.' . "\n" . 'Can be installed with pecl: `pecl install rar`'
+            ? 'install [rar] extension.'."\n".'Can be installed with pecl: `pecl install rar`'
             : null;
     }
 

src/Drivers/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()

Braces +36 added lines, -24 removed lines

@@ -66,8 +66,9 @@ 
     public function __construct($archiveFileName, $format, $password = null)
     {
         $this->open($archiveFileName);
-        if ($password !== null)
-            $this->zip->setPassword($password);
+        if ($password !== null) {
+                    $this->zip->setPassword($password);
+        }
     }
 
     /**
@@ -101,8 +102,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file = $this->zip->statIndex($i);
             // skip directories
-            if (in_array(substr($file['name'], -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file['name'], -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $this->pureFilesNumber++;
             $information->files[$i] = $file['name'];
             $information->compressedFilesSize += $file['comp_size'];
@@ -137,8 +139,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file_name = $this->zip->getNameIndex($i);
             // skip directories
-            if (in_array(substr($file_name, -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file_name, -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $files[] = $file_name;
         }
         return $files;
@@ -175,8 +178,9 @@ 
     public function getFileContent($fileName)
     {
         $result = $this->zip->getFromName($fileName);
-        if ($result === false)
-            throw new Exception('Could not get file information: '.$result.'. May use password?');
+        if ($result === false) {
+                    throw new Exception('Could not get file information: '.$result.'. May use password?');
+        }
         return $result;
     }
 
@@ -197,8 +201,9 @@ 
      */
     public function extractFiles($outputFolder, array $files)
     {
-        if ($this->zip->extractTo($outputFolder, $files) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder, $files) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return count($files);
     }
@@ -210,8 +215,9 @@ 
      */
     public function extractArchive($outputFolder)
     {
-        if ($this->zip->extractTo($outputFolder) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return $this->pureFilesNumber;
     }
@@ -226,8 +232,9 @@ 
     {
         $count = 0;
         foreach ($files as $file) {
-            if ($this->zip->deleteName($file) === false)
-                throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            if ($this->zip->deleteName($file) === false) {
+                            throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            }
             $count++;
         }
 
@@ -250,11 +257,13 @@ 
         $added_files = 0;
         foreach ($files as $localName => $fileName) {
             if (is_null($fileName)) {
-                if ($this->zip->addEmptyDir($localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
             } else {
-                if ($this->zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
                 $added_files++;
             }
         }
@@ -307,8 +316,9 @@ 
         $zip = new ZipArchive();
         $result = $zip->open($archiveFileName, ZipArchive::CREATE);
 
-        if ($result !== true)
-            throw new ArchiveCreationException('ZipArchive error: '.$result);
+        if ($result !== true) {
+                    throw new ArchiveCreationException('ZipArchive error: '.$result);
+        }
 
         $can_set_compression_level = method_exists($zip, 'setCompressionName');
         $can_encrypt = static::canEncrypt(Formats::ZIP);
@@ -326,11 +336,13 @@ 
 
         foreach ($files as $localName => $fileName) {
             if ($fileName === null) {
-                if ($zip->addEmptyDir($localName) === false)
-                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                }
             } else {
-                if ($zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                }
                 if ($can_set_compression_level) {
                     $zip->setCompressionName($localName, $compressionLevelMap[$compressionLevel]);
                 }

src/Drivers/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/Drivers/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