wapmorgan / UnifiedArchive

src/Drivers/SevenZip.php

Braces +21 added lines, -14 removed lines

@@ -120,12 +120,14 @@ 
      */
     public static function getInstallationInstruction()
     {
-        if (!class_exists('\Archive7z\Archive7z'))
-            return 'install library [gemorroj/archive7z]: `composer require gemorroj/archive7z`' . "\n"
+        if (!class_exists('\Archive7z\Archive7z')) {
+                    return 'install library [gemorroj/archive7z]: `composer require gemorroj/archive7z`' . "\n"
                 . ' and console program p7zip [7za]: `apt install p7zip-full` - depends on OS';
+        }
 
-        if (Archive7z::getBinaryVersion() === false)
-            return 'install console program p7zip [7za]: `apt install p7zip-full` - depends on OS';
+        if (Archive7z::getBinaryVersion() === false) {
+                    return 'install console program p7zip [7za]: `apt install p7zip-full` - depends on OS';
+        }
 
         return null;
     }
@@ -138,8 +140,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);
         }
@@ -157,8 +160,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()
@@ -176,8 +180,9 @@ 
     {
         $files = [];
         foreach ($this->sevenZip->getEntries() as $entry) {
-            if ($entry->isDirectory())
-                continue;
+            if ($entry->isDirectory()) {
+                            continue;
+            }
             $files[] = $entry->getPath();
         }
         return $files;
@@ -329,8 +334,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);
         $this->sevenZip->addEntry($tmp_file, true);
@@ -380,8 +386,9 @@ 
             $total_files = count($files);
 
             $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) {

src/Drivers/NelexaZip.php

Braces +3 added lines, -2 removed lines

@@ -42,8 +42,9 @@
         $information = new ArchiveInformation();
 
         foreach ($this->zip->getAllInfo() as $info) {
-            if ($info->isFolder())
-                continue;
+            if ($info->isFolder()) {
+                            continue;
+            }
 
             $this->files[] = $information->files[] = str_replace('\\', '/', $info->getName());
             $information->compressedFilesSize += $info->getCompressedSize();

src/UnifiedArchive.php

Braces +44 added lines, -31 removed lines

@@ -257,13 +257,15 @@ 
      */
     public function getFileNames($filter = null)
     {
-        if ($filter === null)
-            return $this->files;
+        if ($filter === null) {
+                    return $this->files;
+        }
 
         $result = [];
         foreach ($this->files as $file) {
-            if (fnmatch($filter, $file))
-                $result[] = $file;
+            if (fnmatch($filter, $file)) {
+                            $result[] = $file;
+            }
         }
         return $result;
     }
@@ -390,8 +392,9 @@ 
     {
         $files_list = static::createFilesList($fileOrFiles);
 
-        if (empty($files_list))
-            throw new EmptyFileListException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new EmptyFileListException('Files list is empty!');
+        }
 
         $result = $this->archive->addFiles($files_list);
         $this->scanArchive();
@@ -410,8 +413,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([$inArchiveName => $file])
@@ -444,8 +448,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([$inArchivePath => $directory])
@@ -494,13 +499,15 @@ 
     {
         $archiveType = Formats::detectArchiveFormat($archiveName, false);
 
-        if ($archiveType === false)
-            throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
+        if ($archiveType === false) {
+                    throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
+        }
 
         $files_list = static::createFilesList($fileOrFiles);
 
-        if (empty($files_list))
-            throw new EmptyFileListException('Files list is empty!');
+        if (empty($files_list)) {
+                    throw new EmptyFileListException('Files list is empty!');
+        }
 
         $totalSize = 0;
         foreach ($files_list as $fn) {
@@ -554,18 +561,21 @@ 
         $fileProgressCallable = null
  )
     {
-        if (file_exists($archiveName))
-            throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
+        if (file_exists($archiveName)) {
+                    throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
+        }
 
         $info = static::prepareForArchiving($fileOrFiles, $archiveName);
 
         $abilities = [BasicDriver::CREATE];
 
-        if (!Formats::canCreate($info['type']))
-            throw new UnsupportedArchiveException('Unsupported archive type: '.$info['type'].' of archive '.$archiveName);
+        if (!Formats::canCreate($info['type'])) {
+                    throw new UnsupportedArchiveException('Unsupported archive type: '.$info['type'].' of archive '.$archiveName);
+        }
 
-        if ($password !== null && !Formats::canEncrypt($info['type']))
-            throw new UnsupportedOperationException('Archive type '.$info['type'].' can not be encrypted');
+        if ($password !== null && !Formats::canEncrypt($info['type'])) {
+                    throw new UnsupportedOperationException('Archive type '.$info['type'].' can not be encrypted');
+        }
         if ($password !== null) {
             $abilities[] = BasicDriver::CREATE_ENCRYPTED;
         }
@@ -619,8 +629,9 @@ 
      */
     public static function archiveDirectory($directory, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE, $password = null)
     {
-        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, $compressionLevel, $password) > 0;
     }
@@ -656,9 +667,9 @@ 
         if (is_array($nodes)) {
             foreach ($nodes as $destination => $source) {
                 // new format
-                if (is_numeric($destination))
-                    $destination = $source;
-                else {
+                if (is_numeric($destination)) {
+                                    $destination = $source;
+                } else {
                     // old format
                     if (is_string($source) && !file_exists($source)) {
                         list($destination, $source) = [$source, $destination];
@@ -692,11 +703,12 @@ 
 
         } else if (is_string($nodes)) { // passed one file or directory
             // if is directory
-            if (is_dir($nodes))
-                static::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
+            if (is_dir($nodes)) {
+                            static::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;
@@ -713,8 +725,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.php

Braces +3 added lines, -2 removed lines

@@ -160,8 +160,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;