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 +29 added lines, -19 removed lines

@@ -8,8 +8,9 @@ 
 
     public static function registerWrapper()
     {
-        if (!self::$registered)
-            stream_wrapper_register('compress.lzw', __CLASS__);
+        if (!self::$registered) {
+                    stream_wrapper_register('compress.lzw', __CLASS__);
+        }
         self::$registered = true;
     }
 
@@ -40,12 +41,14 @@ 
     {
         // check for compress & uncompress utility
         $this->checkBinary();
-        if (self::$installed === false)
-            throw new \Exception('compress and uncompress commands are required');
+        if (self::$installed === false) {
+                    throw new \Exception('compress and uncompress commands are required');
+        }
 
         $schema = 'compress.lzw://';
-        if (strncasecmp($schema, $path, strlen($schema)) == 0)
-            $path = substr($path, strlen($schema));
+        if (strncasecmp($schema, $path, strlen($schema)) == 0) {
+                    $path = substr($path, strlen($schema));
+        }
 
         if (file_exists($path)) {
             $this->path = realpath($path);
@@ -59,14 +62,16 @@ 
                 $this->read();
             } else {
                 $prefix = basename(__FILE__, '.php');
-                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
-                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                }
+                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
+                }
                 $this->tmp = $tmp;
                 $this->tmp2 = $tmp2;
                 $this->read();
@@ -75,14 +80,16 @@ 
             $this->path = $path;
             if (self::$forceTmpFile) {
                 $prefix = basename(__FILE__, '.php');
-                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                if (($tmp = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
-                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false)
-                    throw new \Exception(__CLASS__.', line '.__LINE__.
+                }
+                if (($tmp2 = tempnam(sys_get_temp_dir(), $prefix)) === false) {
+                                    throw new \Exception(__CLASS__.', line '.__LINE__.
                         ': Could not create temporary file in '.
                         sys_get_temp_dir());
+                }
                 $this->tmp = $tmp;
                 $this->tmp2 = $tmp2;
                 $this->pointer = 0;
@@ -263,7 +270,9 @@ 
         }
         if ($this->tmp !== null) {
             unlink($this->tmp);
-            if (file_exists($this->tmp2)) unlink($this->tmp2);
+            if (file_exists($this->tmp2)) {
+             unlink($this->tmp2);
+            }
         } else {
             $this->data = null;
         }
@@ -407,10 +416,11 @@ 
                 self::$installed = false;
             } else {
                 self::exec('command -v uncompress', $output);
-                if (empty($output))
-                    self::$installed = false;
-                else
-                    self::$installed = true;
+                if (empty($output)) {
+                                    self::$installed = false;
+                } else {
+                                    self::$installed = true;
+                }
             }
         }
     }

src/CamApplication.php

Spacing +2 added lines, -2 removed lines

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

Braces +51 added lines, -34 removed lines

@@ -12,12 +12,14 @@ 
      */
     protected function open($file)
     {
-        if (!UnifiedArchive::canOpenArchive($file))
-            throw new Exception('Could not open archive '.$file.'. Try installing suggested packages or run `cam -f` to see formats support.');
+        if (!UnifiedArchive::canOpenArchive($file)) {
+                    throw new Exception('Could not open archive '.$file.'. Try installing suggested packages or run `cam -f` to see formats support.');
+        }
 
         $archive = UnifiedArchive::open($file);
-        if ($archive === null)
-            throw new Exception('Could not open archive '.$file);
+        if ($archive === null) {
+                    throw new Exception('Could not open archive '.$file);
+        }
 
         return $archive;
     }
@@ -135,17 +137,18 @@ 
      */
     public function formatDate($unixtime)
     {
-        if (strtotime('today') < $unixtime)
-            return 'Today, '.date('G:m', $unixtime);
-        else if (strtotime('yesterday') < $unixtime)
-            return 'Yesterday, '.date('G:m', $unixtime);
-        else {
+        if (strtotime('today') < $unixtime) {
+                    return 'Today, '.date('G:m', $unixtime);
+        } else if (strtotime('yesterday') < $unixtime) {
+                    return 'Yesterday, '.date('G:m', $unixtime);
+        } else {
             $datetime = new \DateTime();
             $datetime->setTimestamp($unixtime);
-            if ($datetime->format('Y') == date('Y'))
-                return $datetime->format('d M, G:m');
-            else
-                return $datetime->format('d M Y, G:m');
+            if ($datetime->format('Y') == date('Y')) {
+                            return $datetime->format('d M, G:m');
+            } else {
+                            return $datetime->format('d M Y, G:m');
+            }
         }
     }
 
@@ -175,25 +178,36 @@ 
         $archive = $this->open($args['ARCHIVE']);
         $output = getcwd();
         if (isset($args['--output'])) {
-            if (!is_dir($args['--output']))
-                mkdir($args['--output']);
+            if (!is_dir($args['--output'])) {
+                            mkdir($args['--output']);
+            }
             $output = realpath($args['--output']);
         }
 
         if (empty($args['FILES_IN_ARCHIVE']) || $args['FILES_IN_ARCHIVE'] == array('/') || $args['FILES_IN_ARCHIVE'] == array('*')) {
             $result = $archive->extractFiles($output);
-            if ($result === false) echo 'Error occured'.PHP_EOL;
-            else echo 'Extracted '.$result.' file(s) to '.$output.PHP_EOL;
+            if ($result === false) {
+             echo 'Error occured'.PHP_EOL;
+            } else {
+             echo 'Extracted '.$result.' file(s) to '.$output.PHP_EOL;
+            }
         } else {
             $extracted = 0;
             $errored = [];
             foreach ($args['FILES_IN_ARCHIVE'] as $file) {
                 $result = $archive->extractFiles($output, $file);
-                if ($result === false) $errored[] = $file;
-                else $extracted += $result;
+                if ($result === false) {
+                 $errored[] = $file;
+                } else {
+                 $extracted += $result;
+                }
+            }
+            if (!empty($errored)) {
+             echo 'Errored: '.implode(', ', $errored).PHP_EOL;
+            }
+            if ($extracted > 0) {
+             echo 'Exctracted '.$extracted.' file(s) to '.$output.PHP_EOL;
             }
-            if (!empty($errored)) echo 'Errored: '.implode(', ', $errored).PHP_EOL;
-            if ($extracted > 0) echo 'Exctracted '.$extracted.' file(s) to '.$output.PHP_EOL;
         }
     }
 
@@ -252,8 +266,9 @@ 
                 echo 'File '.$file.' is NOT in archive'.PHP_EOL;
                 continue;
             }
-            if ($archive->deleteFiles($file) === false)
-                echo 'Error file '.$file.PHP_EOL;
+            if ($archive->deleteFiles($file) === false) {
+                            echo 'Error file '.$file.PHP_EOL;
+            }
         }
     }
 
@@ -266,10 +281,11 @@ 
     {
         $archive = $this->open($args['ARCHIVE']);
         $added_files = $archive->addFiles($args['FILES_ON_DISK']);
-        if ($added_files === false)
-            echo 'Error'.PHP_EOL;
-        else
-            echo 'Added '.$added_files.' file(s)'.PHP_EOL;
+        if ($added_files === false) {
+                    echo 'Error'.PHP_EOL;
+        } else {
+                    echo 'Added '.$added_files.' file(s)'.PHP_EOL;
+        }
     }
 
     /**
@@ -279,17 +295,18 @@ 
     public function create($args)
     {
         if (file_exists($args['ARCHIVE'])) {
-            if (is_dir($args['ARCHIVE']))
-                echo $args['ARCHIVE'].' is a directory!'.PHP_EOL;
-            else {
+            if (is_dir($args['ARCHIVE'])) {
+                            echo $args['ARCHIVE'].' is a directory!'.PHP_EOL;
+            } else {
                 echo 'File '.$args['ARCHIVE'].' already exists!'.PHP_EOL;
             }
         } else {
             $archived_files = UnifiedArchive::archiveFiles($args['FILES_ON_DISK'], $args['ARCHIVE']);
-            if ($archived_files === false)
-                echo 'Error'.PHP_EOL;
-            else
-                echo 'Created archive ' . $args['ARCHIVE'] . ' with ' . $archived_files . ' file(s) of total size ' . implode('', $this->formatSize(filesize($args['ARCHIVE']))) . PHP_EOL;
+            if ($archived_files === false) {
+                            echo 'Error'.PHP_EOL;
+            } else {
+                            echo 'Created archive ' . $args['ARCHIVE'] . ' with ' . $archived_files . ' file(s) of total size ' . implode('', $this->formatSize(filesize($args['ARCHIVE']))) . PHP_EOL;
+            }
         }
     }
 }

src/ArchiveEntry.php

Braces +3 added lines, -2 removed lines

@@ -63,8 +63,9 @@
         $this->compressed_size = $this->compressedSize = $compressedSize;
         $this->uncompressed_size = $this->uncompressedSize = $uncompressedSize;
         $this->mtime = $this->modificationTime = $modificationTime;
-        if ($isCompressed === null)
-            $isCompressed = $uncompressedSize !== $compressedSize;
+        if ($isCompressed === null) {
+                    $isCompressed = $uncompressedSize !== $compressedSize;
+        }
         $this->is_compressed = $this->isCompressed = $isCompressed;
     }
 }
\ No newline at end of file

src/Formats/Zip.php

Spacing +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
      * @return false|int
      * @throws \Exception
      */
-    public static function createArchive(array $files, $archiveFileName){
+    public static function createArchive(array $files, $archiveFileName) {
         $zip = new ZipArchive();
         $result = $zip->open($archiveFileName, ZipArchive::CREATE);
         if ($result !== true)

Braces +30 added lines, -20 removed lines

@@ -71,8 +71,9 @@ 
     public function getFileNames()
     {
         $files = [];
-        for ($i = 0; $i < $this->zip->numFiles; $i++)
-            $files[] = $this->zip->getNameIndex($i);
+        for ($i = 0; $i < $this->zip->numFiles; $i++) {
+                    $files[] = $this->zip->getNameIndex($i);
+        }
         return $files;
     }
 
@@ -107,8 +108,9 @@ 
     public function getFileContent($fileName)
     {
         $result = $this->zip->getFromName($fileName);
-        if ($result === false)
-            throw new Exception('Could not get file information: '.$result);
+        if ($result === false) {
+                    throw new Exception('Could not get file information: '.$result);
+        }
         return $result;
     }
 
@@ -130,8 +132,9 @@ 
      */
     public function extractFiles($outputFolder, array $files)
     {
-        if ($this->zip->extractTo($outputFolder, $files) === false)
-            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder, $files) === false) {
+                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return count($files);
     }
@@ -142,8 +145,9 @@ 
      */
     public function extractArchive($outputFolder)
     {
-        if ($this->zip->extractTo($outputFolder) === false)
-            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder) === false) {
+                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+        }
         return $this->zip->numFiles;
     }
 
@@ -157,8 +161,9 @@ 
     {
         $count = 0;
         foreach ($files as $file) {
-            if ($this->zip->deleteName($file) === false)
-                throw new Exception($this->zip->getStatusString(), $this->zip->status);
+            if ($this->zip->deleteName($file) === false) {
+                            throw new Exception($this->zip->getStatusString(), $this->zip->status);
+            }
             $count++;
         }
 
@@ -181,11 +186,13 @@ 
         $added_files = 0;
         foreach ($files as $localName => $fileName) {
             if (is_null($fileName)) {
-                if ($this->zip->addEmptyDir($localName) === false)
-                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addEmptyDir($localName) === false) {
+                                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                }
             } else {
-                if ($this->zip->addFile($fileName, $localName) === false)
-                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addFile($fileName, $localName) === false) {
+                                    throw new Exception($this->zip->getStatusString(), $this->zip->status);
+                }
                 $added_files++;
             }
         }
@@ -208,15 +215,18 @@ 
     public static function createArchive(array $files, $archiveFileName){
         $zip = new ZipArchive();
         $result = $zip->open($archiveFileName, ZipArchive::CREATE);
-        if ($result !== true)
-            throw new Exception('ZipArchive error: '.$result);
+        if ($result !== true) {
+                    throw new Exception('ZipArchive error: '.$result);
+        }
         foreach ($files as $localName => $fileName) {
             if ($fileName === null) {
-                if ($zip->addEmptyDir($localName) === false)
-                    return false;
+                if ($zip->addEmptyDir($localName) === false) {
+                                    return false;
+                }
             } else {
-                if ($zip->addFile($fileName, $localName) === false)
-                    return false;
+                if ($zip->addFile($fileName, $localName) === false) {
+                                    return false;
+                }
             }
         }
         $zip->close();

src/Formats/OneFileFormat.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
      * @return false|int
      * @throws \wapmorgan\UnifiedArchive\UnsupportedOperationException
      */
-    public static function createArchive(array $files, $archiveFileName){
+    public static function createArchive(array $files, $archiveFileName) {
         if (count($files) > 1) return false;
         $filename = array_shift($files);
         if (is_null($filename)) return false; // invalid list

Braces +19 added lines, -10 removed lines

@@ -25,8 +25,9 @@ 
      */
     public function __construct($archiveFileName)
     {
-        if (static::FORMAT_SUFFIX === null)
-            throw new \Exception('Format should be initialized');
+        if (static::FORMAT_SUFFIX === null) {
+                    throw new \Exception('Format should be initialized');
+        }
         $this->fileName = $archiveFileName;
         $this->inArchiveFileName = basename($archiveFileName, '.'.self::FORMAT_SUFFIX);
     }
@@ -93,11 +94,13 @@ 
     public function extractArchive($outputFolder)
     {
         $data = $this->getFileContent($this->inArchiveFileName);
-        if ($data === false)
-            throw new Exception('Could not extract archive');
+        if ($data === false) {
+                    throw new Exception('Could not extract archive');
+        }
 
-        if (file_put_contents($outputFolder.$this->inArchiveFileName, $data) !== false)
-            return 1;
+        if (file_put_contents($outputFolder.$this->inArchiveFileName, $data) !== false) {
+                    return 1;
+        }
     }
 
     /**
@@ -130,12 +133,18 @@ 
      * @throws \wapmorgan\UnifiedArchive\UnsupportedOperationException
      */
     public static function createArchive(array $files, $archiveFileName){
-        if (count($files) > 1) return false;
+        if (count($files) > 1) {
+         return false;
+        }
         $filename = array_shift($files);
-        if (is_null($filename)) return false; // invalid list
+        if (is_null($filename)) {
+         return false;
+        }
+        // invalid list
         if (file_put_contents($archiveFileName,
-                static::compressData(file_get_contents($filename))) !== false)
-            return 1;
+                static::compressData(file_get_contents($filename))) !== false) {
+                    return 1;
+        }
     }
 
     /**

src/Formats/SevenZip.php

Spacing +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
         $information = new ArchiveInformation();
         foreach ($this->sevenZip->getEntries() as $entry) {
             $information->files[] = $entry->getPath();
-            $information->compressedFilesSize += (int)$entry->getPackedSize();
-            $information->uncompressedFilesSize += (int)$entry->getSize();
+            $information->compressedFilesSize += (int) $entry->getPackedSize();
+            $information->uncompressedFilesSize += (int) $entry->getSize();
         }
         return $information;
     }

Braces +3 added lines, -2 removed lines

@@ -47,8 +47,9 @@
     public function getFileNames()
     {
         $files = [];
-        foreach ($this->sevenZip->getEntries() as $entry)
-            $files[] = $entry->getPath();
+        foreach ($this->sevenZip->getEntries() as $entry) {
+                    $files[] = $entry->getPath();
+        }
         return $files;
     }
 

src/Formats/Rar.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
      * @param string $archiveFileName
      * @throws \wapmorgan\UnifiedArchive\UnsupportedOperationException
      */
-    public static function createArchive(array $files, $archiveFileName){
+    public static function createArchive(array $files, $archiveFileName) {
         throw new UnsupportedOperationException();
     }
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -101,7 +101,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());
     }
 
@@ -113,7 +115,9 @@ 
     public function getFileResource($fileName)
     {
         $entry = $this->rar->getEntry($fileName);
-        if ($entry->isDirectory()) return false;
+        if ($entry->isDirectory()) {
+         return false;
+        }
         return $entry->getStream();
     }
 

src/Formats/Lzma.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */
 class Lzma extends OneFileFormat
 {
-    const FORMAT_SUFFIX =  'xz';
+    const FORMAT_SUFFIX = 'xz';
 
     /**
      * Lzma constructor.

src/Formats/Iso.php

Spacing +5 added lines, -5 removed lines

@@ -74,14 +74,14 @@ 
                     if (in_array($file->strd_FileId, ['.', '..']))
                         continue;
                     $this->files[$file->Location]
-                        = $directory . $file->strd_FileId;
+                        = $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),
                         ];
                 }
             }
@@ -129,7 +129,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);
     }
 
     /**
@@ -221,7 +221,7 @@ 
      * @return false|int
      * @throws UnsupportedOperationException
      */
-    public static function createArchive(array $files, $archiveFileName){
+    public static function createArchive(array $files, $archiveFileName) {
         throw new UnsupportedOperationException();
     }
 }
\ No newline at end of file

Braces +21 added lines, -12 removed lines

@@ -52,8 +52,9 @@ 
 
         $usedDesc =
             $this->iso->GetDescriptor(SUPPLEMENTARY_VOLUME_DESC);
-        if (!$usedDesc)
-            $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        if (!$usedDesc) {
+                    $usedDesc = $this->iso->GetDescriptor(PRIMARY_VOLUME_DESC);
+        }
         $this->blockSize = $usedDesc->iBlockSize;
 
         $directories = $usedDesc->LoadMPathTable($this->iso);
@@ -71,8 +72,9 @@ 
                 $usedDesc->iBlockSize, true);
             if ($files) {
                 foreach ($files as $file) {
-                    if (in_array($file->strd_FileId, ['.', '..']))
-                        continue;
+                    if (in_array($file->strd_FileId, ['.', '..'])) {
+                                            continue;
+                    }
                     $this->files[$file->Location]
                         = $directory . $file->strd_FileId;
                     $this->filesSize += $file->DataLen;
@@ -125,8 +127,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);
@@ -140,11 +143,14 @@ 
     public function getFileContent($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 $this->iso->Read($data['size']);
     }
@@ -157,11 +163,14 @@ 
     public function getFileResource($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;
+        }
 
         $resource = fopen('php://temp', 'r+');
         fwrite($resource, $this->iso->Read($data['size']));