wapmorgan / UnifiedArchive

src/UnifiedArchive.php

Braces +76 added lines, -50 removed lines

@@ -87,8 +87,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)) {
@@ -239,8 +240,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 = static::$formatHandlers[$type];
 
@@ -277,8 +279,9 @@ 
      */
     public function getPclZipInterface()
     {
-        if ($this->type !== self::ZIP)
-            throw new UnsupportedOperationException('Format '.$this->type.' does not support PclZip-interface');
+        if ($this->type !== self::ZIP) {
+                    throw new UnsupportedOperationException('Format '.$this->type.' does not support PclZip-interface');
+        }
 
         return $this->archive->getPclZip();
     }
@@ -362,8 +365,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);
     }
@@ -377,8 +381,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);
     }
@@ -391,8 +396,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);
     }
@@ -409,10 +415,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 {
@@ -434,8 +443,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();
@@ -452,8 +462,9 @@ 
     public function addFiles($fileOrFiles)
     {
         $files_list = self::createFilesList($fileOrFiles);
-        if (empty($files_list))
-            throw new InvalidArgumentException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new InvalidArgumentException('Files list is empty!');
+        }
         $result = $this->archive->addFiles($files_list);
         $this->scanArchive();
         return $result;
@@ -469,8 +480,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])
@@ -487,8 +499,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])
@@ -524,25 +537,30 @@ 
      */
     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);
-        if (empty($files_list))
-            throw new InvalidArgumentException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new InvalidArgumentException('Files list is empty!');
+        }
 
         // 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,
@@ -552,8 +570,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 = static::$formatHandlers[$archiveType];
 
@@ -570,8 +589,9 @@ 
      */
     public static 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;
     }
@@ -586,8 +606,9 @@ 
      */
     public static 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;
     }
@@ -656,8 +677,9 @@ 
         $newFiles = [];
         foreach ($files as $file) {
             foreach ($archiveFiles as $archiveFile) {
-                if (fnmatch($file.'*', $archiveFile))
-                    $newFiles[] = $archiveFile;
+                if (fnmatch($file.'*', $archiveFile)) {
+                                    $newFiles[] = $archiveFile;
+                }
             }
         }
         return $newFiles;
@@ -674,26 +696,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;
@@ -710,8 +735,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) {

src/Formats/Archive7z.php

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
         $binary = static::makeBinary7z();
         $process = new Process([str_replace('\\', '/', $binary)]);
         $result = $process->mustRun()->getOutput();
-        if (!preg_match('~7-Zip (\[[\d]+\] )?(?<version>\d+\.\d+)~i', $result, $version))
-            return false;
+        if (!preg_match('~7-Zip (\[[\d]+\] )?(?<version>\d+\.\d+)~i', $result, $version)) {
+                    return false;
+        }
 
         return $version['version'];
     }