wapmorgan / UnifiedArchive

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

@@ -63,8 +63,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);
+        }
     }
 
     /**
@@ -97,8 +98,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;
+            }
             $information->files[$i] = $file['name'];
             $information->compressedFilesSize += $file['comp_size'];
             $information->uncompressedFilesSize += $file['size'];
@@ -115,8 +117,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;
@@ -153,8 +156,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;
     }
 
@@ -175,8 +179,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);
     }
@@ -188,8 +193,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->zip->numFiles;
     }
@@ -204,8 +210,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++;
         }
 
@@ -228,11 +235,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++;
             }
         }
@@ -267,8 +276,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 = method_exists($zip, 'setEncryptionName');
@@ -279,11 +289,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/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/Drivers/OneFile/OneFileDriver.php

Braces +9 added lines, -6 removed lines

@@ -25,10 +25,12 @@ 
      */
     public function __construct($archiveFileName, $format, $password = null)
     {
-        if (static::FORMAT_SUFFIX === null)
-            throw new \Exception('Format should be initialized');
-        if ($password !== null)
-            throw new UnsupportedOperationException(self::FORMAT_SUFFIX.' archive does not support password!');
+        if (static::FORMAT_SUFFIX === null) {
+                    throw new \Exception('Format should be initialized');
+        }
+        if ($password !== null) {
+                    throw new UnsupportedOperationException(self::FORMAT_SUFFIX.' archive does not support password!');
+        }
 
         $this->fileName = $archiveFileName;
         $this->inArchiveFileName = basename($archiveFileName, '.'.self::FORMAT_SUFFIX);
@@ -96,8 +98,9 @@ 
     public function extractArchive($outputFolder)
     {
         $data = $this->getFileContent($this->inArchiveFileName);
-        if ($data === false)
-            throw new ArchiveExtractionException('Could not extract archive');
+        if ($data === false) {
+                    throw new ArchiveExtractionException('Could not extract archive');
+        }
 
         $size = strlen($data);
         $written = file_put_contents($outputFolder.$this->inArchiveFileName, $data);

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

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

Braces +24 added lines, -16 removed lines

@@ -97,11 +97,13 @@ 
      */
     public static function getInstallationInstruction()
     {
-        if (!class_exists('\Archive7z\Archive7z'))
-            return 'install library `gemorroj/archive7z` and console program p7zip (7za)';
+        if (!class_exists('\Archive7z\Archive7z')) {
+                    return 'install library `gemorroj/archive7z` and console program p7zip (7za)';
+        }
 
-        if (Archive7z::getBinaryVersion() === false)
-            return 'install console program p7zip (7za)';
+        if (Archive7z::getBinaryVersion() === false) {
+                    return 'install console program p7zip (7za)';
+        }
 
         return null;
     }
@@ -114,8 +116,9 @@ 
         try {
             $this->format = $format;
             $this->sevenZip = new Archive7z($archiveFileName, null, null);
-            if ($password !== null)
-                $this->sevenZip->setPassword($password);
+            if ($password !== null) {
+                            $this->sevenZip->setPassword($password);
+            }
         } catch (\Archive7z\Exception $e) {
             throw new Exception('Could not open 7Zip archive: '.$e->getMessage(), $e->getCode(), $e);
         }
@@ -133,8 +136,9 @@ 
                 continue;
             }
 
-            if (!isset($can_get_unix_path))
-                $can_get_unix_path = method_exists($entry, 'getUnixPath');
+            if (!isset($can_get_unix_path)) {
+                            $can_get_unix_path = method_exists($entry, 'getUnixPath');
+            }
 
             $information->files[] = $can_get_unix_path
                 ? $entry->getUnixPath()
@@ -152,8 +156,9 @@ 
     {
         $files = [];
         foreach ($this->sevenZip->getEntries() as $entry) {
-            if ($entry->isDirectory())
-                continue;
+            if ($entry->isDirectory()) {
+                            continue;
+            }
             $files[] = $entry->getPath();
         }
         return $files;
@@ -294,8 +299,9 @@ 
     public function addFileFromString($inArchiveName, $content)
     {
         $tmp_file = tempnam(sys_get_temp_dir(), 'ua');
-        if (!$tmp_file)
-            throw new ArchiveModificationException('Could not create temporarily file');
+        if (!$tmp_file) {
+                    throw new ArchiveModificationException('Could not create temporarily file');
+        }
 
         file_put_contents($tmp_file, $content);
         unset($content);
@@ -325,8 +331,9 @@ 
 
         try {
             $seven_zip = new Archive7z($archiveFileName);
-            if ($password !== null)
-                $seven_zip->setPassword($password);
+            if ($password !== null) {
+                            $seven_zip->setPassword($password);
+            }
             $seven_zip->setCompressionLevel($compressionLevelMap[$compressionLevel]);
             foreach ($files as $localName => $filename) {
                 if ($filename !== null) {
@@ -355,8 +362,9 @@ 
             Formats::TAR,
             Formats::LZMA,
             Formats::ZIP]
-        ))
-            return self::canRenameFiles();
+        )) {
+                    return self::canRenameFiles();
+        }
 
         return false;
     }

src/ArchiveEntry.php

Braces +3 added lines, -2 removed lines

@@ -43,8 +43,9 @@
         $this->compressedSize = $compressedSize;
         $this->uncompressedSize = $uncompressedSize;
         $this->modificationTime = $modificationTime;
-        if ($isCompressed === null)
-            $isCompressed = $uncompressedSize !== $compressedSize;
+        if ($isCompressed === null) {
+                    $isCompressed = $uncompressedSize !== $compressedSize;
+        }
         $this->isCompressed = $isCompressed;
         $this->comment = $comment;
     }

src/CamApplication.php

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
     public function checkFormats()
     {
         echo "format\topen\tstream\tcreate\tappend\tupdate\tencrypt\tdrivers".PHP_EOL;
-        foreach(Formats::getFormatsReport() as $format => $config) {
+        foreach (Formats::getFormatsReport() as $format => $config) {
             echo $format."\t"
                 .($config['open'] ? '+' : '-')."\t"
                 .($config['stream'] ? '+' : '-')."\t"
@@ -55,7 +55,7 @@ 
             if (!empty($install)) {
                 $notInstalled[] = [$driverClass, $description, $install];
             } else {
-                echo ($i++) . '. ' . $driverClass . ' - ' . $description . PHP_EOL;
+                echo ($i++).'. '.$driverClass.' - '.$description.PHP_EOL;
             }
         }
 
@@ -63,8 +63,8 @@ 
             echo PHP_EOL.'Not installed:'.PHP_EOL;
             $i = 1;
             foreach ($notInstalled as $data) {
-                echo ($i++) . '. ' . $data[0] . ' - ' . $data[1] . PHP_EOL
-                    . '- ' . $data[2] . PHP_EOL.PHP_EOL;
+                echo ($i++).'. '.$data[0].' - '.$data[1].PHP_EOL
+                    . '- '.$data[2].PHP_EOL.PHP_EOL;
             }
         }
     }
@@ -298,7 +298,7 @@ 
         else {
             $size = $this->formatSize($len);
             echo sprintf('Added %s(%1.1f%s) file to %s',
-                    $args['FILE_IN_ARCHIVE'], $size[0], $size[1], $args['ARCHIVE']) . PHP_EOL;
+                    $args['FILE_IN_ARCHIVE'], $size[0], $size[1], $args['ARCHIVE']).PHP_EOL;
         }
     }
 
@@ -332,7 +332,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 +54 added lines, -37 removed lines

@@ -15,12 +15,14 @@ 
      */
     protected function open($file, $password = null)
     {
-        if (!UnifiedArchive::canOpen($file))
-            throw new Exception('Could not open archive '.$file.'. Try installing suggested packages or run `cam -f` to see formats support.');
+        if (!UnifiedArchive::canOpen($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, $password);
-        if ($archive === null)
-            throw new Exception('Could not open archive '.$file);
+        if ($archive === null) {
+                    throw new Exception('Could not open archive '.$file);
+        }
 
         return $archive;
     }
@@ -141,17 +143,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');
+            }
         }
     }
 
@@ -181,25 +184,36 @@ 
         $archive = $this->open($args['ARCHIVE'], isset($args['--password']) ? $args['--password'] : null);
         $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;
         }
     }
 
@@ -258,8 +272,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;
+            }
         }
     }
 
@@ -272,10 +287,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;
+        }
     }
 
     /**
@@ -293,9 +309,9 @@ 
         $len = strlen($content);
 
         $added_files = $archive->addFileFromString($args['FILE_IN_ARCHIVE'], $content);
-        if ($added_files === false)
-            echo 'Error'.PHP_EOL;
-        else {
+        if ($added_files === false) {
+                    echo 'Error'.PHP_EOL;
+        } else {
             $size = $this->formatSize($len);
             echo sprintf('Added %s(%1.1f%s) file to %s',
                     $args['FILE_IN_ARCHIVE'], $size[0], $size[1], $args['ARCHIVE']) . PHP_EOL;
@@ -310,9 +326,9 @@ 
     {
         $password = isset($args['--password']) ? $args['--password'] : null;
         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 {
@@ -329,10 +345,11 @@ 
             }
 
             $archived_files = UnifiedArchive::archiveFiles($files, $args['ARCHIVE'], BasicDriver::COMPRESSION_AVERAGE, $password);
-            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/Formats.php

Braces +18 added lines, -12 removed lines

@@ -158,8 +158,9 @@ 
         // by file content
         if ($contentCheck) {
             $mime_type = mime_content_type($fileName);
-            if (isset(static::$mimeTypes[$mime_type]))
-                return static::$mimeTypes[$mime_type];
+            if (isset(static::$mimeTypes[$mime_type])) {
+                            return static::$mimeTypes[$mime_type];
+            }
         }
 
         return false;
@@ -251,12 +252,14 @@ 
     protected static function checkFormatSupport($format, $function)
     {
         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;
@@ -271,15 +274,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;
     }