wapmorgan / UnifiedArchive

src/UnifiedArchive.php

Braces +36 added lines, -22 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];
 

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

Spacing +2 added lines, -2 removed lines

@@ -171,7 +171,7 @@ 
                 $compression = 'lzma2';
                 break;
             case 'z':
-                $tar_aname = 'compress.lzw://' . $archiveFileName;
+                $tar_aname = 'compress.lzw://'.$archiveFileName;
                 break;
         }
 
@@ -324,7 +324,7 @@ 
                 if (!self::$enabledPharData) {
                     throw new Exception('Archive_Tar not available');
                 }
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->archiveFileName);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->archiveFileName);
                 break;
 
             default:

Braces +50 added lines, -33 removed lines

@@ -140,11 +140,13 @@ 
     {
         static::checkRequirements();
 
-        if (static::$enabledPearTar)
-            return static::createArchiveForPear($files, $archiveFileName);
+        if (static::$enabledPearTar) {
+                    return static::createArchiveForPear($files, $archiveFileName);
+        }
 
-        if (static::$enabledPharData)
-            return static::createArchiveForPhar($files, $archiveFileName);
+        if (static::$enabledPharData) {
+                    return static::createArchiveForPhar($files, $archiveFileName);
+        }
 
         throw new Exception('Archive_Tar nor PharData not available');
     }
@@ -175,21 +177,25 @@ 
                 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)
-                    return false;
+                if ($tar->addString($localName, '') === false) {
+                                    return false;
+                }
             } else {
                 if ($tar->addModify($filename, $add_dir, $remove_dir)
-                    === false) return false;
+                    === false) {
+                 return false;
+                }
             }
         }
         $tar = null;
@@ -277,8 +283,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);
     }
 
@@ -380,8 +387,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);
@@ -399,14 +407,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);
@@ -430,8 +440,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);
         }
@@ -448,12 +459,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;
@@ -508,14 +521,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;
@@ -538,11 +553,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/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']));