wapmorgan / UnifiedArchive

src/UnifiedArchive.php

Braces +41 added lines, -29 removed lines

@@ -266,13 +266,15 @@ 
      */
     public function getFiles($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;
     }
@@ -395,8 +397,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();
@@ -415,8 +418,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->add([$inArchiveName => $file])
@@ -449,8 +453,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->add([$inArchivePath => $directory])
@@ -506,8 +511,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!');
+        }
 
         $totalSize = 0;
         foreach ($files_list as $fn) {
@@ -561,18 +567,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;
         }
@@ -690,8 +699,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::archive($directory, $archiveName, $compressionLevel, $password) > 0;
     }
@@ -727,9 +737,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];
@@ -763,11 +773,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;
@@ -784,8 +795,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) {