wapmorgan / UnifiedArchive

src/Formats/Cab.php

Spacing +1 added lines, -1 removed lines

@@ -168,7 +168,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

src/Formats/Tar.php

Spacing +2 added lines, -2 removed lines

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

Braces +50 added lines, -34 removed lines

@@ -141,11 +141,13 @@ 
     {
         static::checkRequirements();
 
-        if (static::$enabledPharData)
-            return static::createArchiveForPhar($files, $archiveFileName);
+        if (static::$enabledPharData) {
+                    return static::createArchiveForPhar($files, $archiveFileName);
+        }
 
-        if (static::$enabledPearTar)
-            return static::createArchiveForPear($files, $archiveFileName);
+        if (static::$enabledPearTar) {
+                    return static::createArchiveForPear($files, $archiveFileName);
+        }
 
         throw new Exception('Archive_Tar nor PharData not available');
     }
@@ -177,21 +179,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 Exception('Error when adding directory '.$localName.' to archive');
+                if ($tar->addString($localName, '') === false) {
+                                    throw new Exception('Error when adding directory '.$localName.' to archive');
+                }
             } else {
-                if ($tar->addModify($filename, $add_dir, $remove_dir) === false)
-                    throw new Exception('Error when adding file '.$filename.' to archive');
+                if ($tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                    throw new Exception('Error when adding file '.$filename.' to archive');
+                }
             }
         }
         $tar = null;
@@ -279,8 +284,9 @@ 
 
         $this->archiveFileName = realpath($archiveFileName);
         $this->archiveType = static::detectArchiveType($this->archiveFileName);
-        if ($this->archiveType === false)
-            throw new \Exception('Could not detect type for archive '.$this->archiveFileName);
+        if ($this->archiveType === false) {
+                    throw new \Exception('Could not detect type for archive '.$this->archiveFileName);
+        }
         $this->open($this->archiveType);
     }
 
@@ -392,8 +398,9 @@ 
      */
     public function isFileExists($fileName)
     {
-        if ($this->tar instanceof Archive_Tar)
-            return isset($this->pearFilesIndex[$fileName]);
+        if ($this->tar instanceof Archive_Tar) {
+                    return isset($this->pearFilesIndex[$fileName]);
+        }
 
         try {
             $this->tar->offsetGet($fileName);
@@ -411,14 +418,16 @@ 
     public function getFileData($fileName)
     {
         if ($this->tar instanceof Archive_Tar) {
-            if (!isset($this->pearFilesIndex[$fileName]))
-                throw new Exception('File '.$fileName.' is not found in archive files list');
+            if (!isset($this->pearFilesIndex[$fileName])) {
+                            throw new Exception('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 Exception('File '.$fileName.' is not found in Tar archive');
+            if (!isset($files_list[$index])) {
+                            throw new Exception('File '.$fileName.' is not found in Tar archive');
+            }
 
             $data = $files_list[$index];
             unset($files_list);
@@ -442,8 +451,9 @@ 
     public function getFileContent($fileName)
     {
         if ($this->tar instanceof Archive_Tar) {
-            if (!isset($this->pearFilesIndex[$fileName]))
-                throw new Exception('File '.$fileName.' is not found in archive files list');
+            if (!isset($this->pearFilesIndex[$fileName])) {
+                            throw new Exception('File '.$fileName.' is not found in archive files list');
+            }
 
             return $this->tar->extractInString($fileName);
         }
@@ -460,12 +470,14 @@ 
     {
         $resource = fopen('php://temp', 'r+');
         if ($this->tar instanceof Archive_Tar) {
-            if (!isset($this->pearFilesIndex[$fileName]))
-                throw new Exception('File '.$fileName.' is not found in archive files list');
+            if (!isset($this->pearFilesIndex[$fileName])) {
+                            throw new Exception('File '.$fileName.' is not found in archive files list');
+            }
 
             fwrite($resource, $this->tar->extractInString($fileName));
-        } else
-            fwrite($resource, $this->tar->offsetGet($fileName)->getContent());
+        } else {
+                    fwrite($resource, $this->tar->offsetGet($fileName)->getContent());
+        }
 
         rewind($resource);
         return $resource;
@@ -520,14 +532,16 @@ 
      */
     public function deleteFiles(array $files)
     {
-        if ($this->tar instanceof Archive_Tar)
-            throw new UnsupportedOperationException();
+        if ($this->tar instanceof Archive_Tar) {
+                    throw new UnsupportedOperationException();
+        }
 
         $deleted = 0;
 
         foreach ($files as $i => $file) {
-            if ($this->tar->delete($file))
-                $deleted++;
+            if ($this->tar->delete($file)) {
+                            $deleted++;
+            }
         }
 
         $this->tar = null;
@@ -550,11 +564,13 @@ 
                 $remove_dir = dirname($filename);
                 $add_dir = dirname($localName);
                 if (is_null($filename)) {
-                    if ($this->tar->addString($localName, "") === false)
-                        return false;
+                    if ($this->tar->addString($localName, "") === false) {
+                                            return false;
+                    }
                 } else {
-                    if ($this->tar->addModify($filename, $add_dir, $remove_dir) === false)
-                        return false;
+                    if ($this->tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                            return false;
+                    }
                     $added++;
                 }
             }

src/Formats/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/UnifiedArchive.php

Braces +67 added lines, -44 removed lines

@@ -80,8 +80,9 @@ 
     {
         self::checkRequirements();
 
-        if (!file_exists($fileName) || !is_readable($fileName))
-            throw new Exception('Could not open file: '.$fileName);
+        if (!file_exists($fileName) || !is_readable($fileName)) {
+                    throw new Exception('Could not open file: '.$fileName);
+        }
 
         $type = self::detectArchiveType($fileName);
         if (!self::canOpenType($type)) {
@@ -224,8 +225,9 @@ 
         $this->type = $type;
         $this->archiveSize = filesize($fileName);
 
-        if (!isset(static::$formatHandlers[$type]))
-            throw new Exception('Unsupported archive type: '.$type.' of archive '.$fileName);
+        if (!isset(static::$formatHandlers[$type])) {
+                    throw new Exception('Unsupported archive type: '.$type.' of archive '.$fileName);
+        }
 
         $handler_class = __NAMESPACE__.'\\Formats\\'.static::$formatHandlers[$type];
 
@@ -342,8 +344,9 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         return $this->archive->getFileData($fileName);
     }
@@ -358,8 +361,9 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         return $this->archive->getFileContent($fileName);
     }
@@ -371,8 +375,9 @@ 
      */
     public function getFileResource($fileName)
     {
-        if (!in_array($fileName, $this->files, true))
-            return false;
+        if (!in_array($fileName, $this->files, true)) {
+                    return false;
+        }
 
         return $this->archive->getFileResource($fileName);
     }
@@ -388,10 +393,13 @@ 
     public function extractFiles($outputFolder, $files = null, $expandFilesList = false)
     {
         if ($files !== null) {
-            if (is_string($files)) $files = [$files];
+            if (is_string($files)) {
+             $files = [$files];
+            }
 
-            if ($expandFilesList)
-                $files = self::expandFileList($this->files, $files);
+            if ($expandFilesList) {
+                            $files = self::expandFileList($this->files, $files);
+            }
 
             return $this->archive->extractFiles($outputFolder, $files);
         } else {
@@ -412,8 +420,9 @@ 
     {
         $fileOrFiles = is_string($fileOrFiles) ? [$fileOrFiles] : $fileOrFiles;
 
-        if ($expandFilesList && $fileOrFiles !== null)
-            $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        if ($expandFilesList && $fileOrFiles !== null) {
+                    $fileOrFiles = self::expandFileList($this->files, $fileOrFiles);
+        }
 
         $result = $this->archive->deleteFiles($fileOrFiles);
         $this->scanArchive();
@@ -446,23 +455,27 @@ 
      */
     public static function archiveFiles($fileOrFiles, $archiveName, $emulate = false)
     {
-        if (file_exists($archiveName))
-            throw new Exception('Archive '.$archiveName.' already exists!');
+        if (file_exists($archiveName)) {
+                    throw new Exception('Archive '.$archiveName.' already exists!');
+        }
 
         self::checkRequirements();
 
         $archiveType = self::detectArchiveType($archiveName, false);
 //        if (in_array($archiveType, [TarArchive::TAR, TarArchive::TAR_GZIP, TarArchive::TAR_BZIP, TarArchive::TAR_LZMA, TarArchive::TAR_LZW], true))
 //            return TarArchive::archiveFiles($fileOrFiles, $archiveName, $emulate);
-        if ($archiveType === false)
-            return false;
+        if ($archiveType === false) {
+                    return false;
+        }
 
         $files_list = self::createFilesList($fileOrFiles);
 
         // fake creation: return archive data
         if ($emulate) {
             $totalSize = 0;
-            foreach ($files_list as $fn) $totalSize += filesize($fn);
+            foreach ($files_list as $fn) {
+             $totalSize += filesize($fn);
+            }
 
             return array(
                 'totalSize' => $totalSize,
@@ -472,8 +485,9 @@ 
             );
         }
 
-        if (!isset(static::$formatHandlers[$archiveType]))
-            throw new Exception('Unsupported archive type: '.$archiveType.' of archive '.$archiveName);
+        if (!isset(static::$formatHandlers[$archiveType])) {
+                    throw new Exception('Unsupported archive type: '.$archiveType.' of archive '.$archiveName);
+        }
 
         $handler_class = __NAMESPACE__.'\\Formats\\'.static::$formatHandlers[$archiveType];
 
@@ -539,8 +553,9 @@ 
         $newFiles = [];
         foreach ($files as $file) {
             foreach ($archiveFiles as $archiveFile) {
-                if (fnmatch($file.'*', $archiveFile))
-                    $newFiles[] = $archiveFile;
+                if (fnmatch($file.'*', $archiveFile)) {
+                                    $newFiles[] = $archiveFile;
+                }
             }
         }
         return $newFiles;
@@ -557,26 +572,29 @@ 
         // passed an extended list
         if (is_array($nodes)) {
             foreach ($nodes as $source => $destination) {
-                if (is_numeric($source))
-                    $source = $destination;
+                if (is_numeric($source)) {
+                                    $source = $destination;
+                }
 
                 $destination = rtrim($destination, '/\\*');
 
                 // if is directory
-                if (is_dir($source))
-                    self::importFilesFromDir(rtrim($source, '/\\*').'/*',
+                if (is_dir($source)) {
+                                    self::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))
-                self::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
+            if (is_dir($nodes)) {
+                            self::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;
@@ -593,8 +611,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) {
@@ -613,8 +632,9 @@ 
      */
     static public function archiveFile($file, $archiveName)
     {
-        if (!is_file($file))
-            throw new \InvalidArgumentException($file.' is not a valid file to archive');
+        if (!is_file($file)) {
+                    throw new \InvalidArgumentException($file.' is not a valid file to archive');
+        }
 
         return static::archiveFiles($file, $archiveName) === 1;
     }
@@ -627,8 +647,9 @@ 
      */
     static public function archiveDirectory($directory, $archiveName)
     {
-        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;
     }
@@ -641,8 +662,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([$file => $inArchiveName])
@@ -657,8 +679,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([$directory => $inArchivePath])