wapmorgan / UnifiedArchive

src/ArchiveEntry.php

Braces +3 added lines, -2 removed lines

@@ -46,8 +46,9 @@
         $this->compressedSize = $compressedSize;
         $this->uncompressedSize = $uncompressedSize;
         $this->modificationTime = $modificationTime;
-        if ($isCompressed === null)
-            $isCompressed = $uncompressedSize !== $compressedSize;
+        if ($isCompressed === null) {
+                    $isCompressed = $uncompressedSize !== $compressedSize;
+        }
         $this->isCompressed = $isCompressed;
         $this->comment = $comment;
         $this->crc32 = $crc32;

src/Drivers/SevenZip.php

Spacing +4 added lines, -4 removed lines

@@ -108,7 +108,7 @@ 
     public static function getInstallationInstruction()
     {
         if (!class_exists('\Archive7z\Archive7z'))
-            return 'install library [gemorroj/archive7z]: `composer require gemorroj/archive7z`' . "\n"
+            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)
@@ -150,8 +150,8 @@ 
             $information->files[] = $can_get_unix_path
                 ? $entry->getUnixPath()
                 : str_replace('\\', '/', $entry->getPath());
-            $information->compressedFilesSize += (int)$entry->getPackedSize();
-            $information->uncompressedFilesSize += (int)$entry->getSize();
+            $information->compressedFilesSize += (int) $entry->getPackedSize();
+            $information->uncompressedFilesSize += (int) $entry->getSize();
         }
         return $information;
     }
@@ -209,7 +209,7 @@ 
     {
         $entry = $this->sevenZip->getEntry($fileName);
         if ($entry === null) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist');
         }
         return $entry->getContent();
     }

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/Commands/FormatCommand.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
             $question = new ChoiceQuestion('Which format', array_keys($formats));
             $format = $helper->ask($input, $output, $question);
         }
-        $output->writeln('Format <info>' . $format . '</info> drivers support');
+        $output->writeln('Format <info>'.$format.'</info> drivers support');
 
         $table = new Table($output);
         $table->setHeaders(['format', ...array_keys(self::$abilitiesLabels)]);

src/Drivers/TarByPear.php

Braces +26 added lines, -18 removed lines

@@ -165,10 +165,11 @@ 
                 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);
+        }
 
         $current_file = 0;
         $total_files = count($files);
@@ -177,11 +178,13 @@ 
             $add_dir = dirname($localName);
 
             if (is_null($filename)) {
-                if ($tar->addString($localName, '') === false)
-                    throw new ArchiveCreationException('Error when adding directory '.$localName.' to archive');
+                if ($tar->addString($localName, '') === false) {
+                                    throw new ArchiveCreationException('Error when adding directory '.$localName.' to archive');
+                }
             } else {
-                if ($tar->addModify($filename, $add_dir, $remove_dir) === false)
-                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                if ($tar->addModify($filename, $add_dir, $remove_dir) === false) {
+                                    throw new ArchiveCreationException('Error when adding file '.$filename.' to archive');
+                }
             }
             if ($fileProgressCallable !== null) {
                 call_user_func_array($fileProgressCallable, [$current_file++, $total_files, $filename, $localName]);
@@ -242,8 +245,9 @@ 
                 continue;
             }
             // skip directories
-            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/')
-                continue;
+            if ($file['typeflag'] == '5' || substr($file['filename'], -1) === '/') {
+                            continue;
+            }
             $information->files[] = $file['filename'];
             $information->uncompressedFilesSize += $file['size'];
             $this->pearFilesIndex[$file['filename']] = $i;
@@ -289,14 +293,16 @@ 
      */
     public function getFileData($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('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 NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        if (!isset($files_list[$index])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in Tar archive');
+        }
 
         $data = $files_list[$index];
         unset($files_list);
@@ -311,8 +317,9 @@ 
      */
     public function getFileContent($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return $this->tar->extractInString($fileName);
     }
@@ -322,8 +329,9 @@ 
      */
     public function getFileStream($fileName)
     {
-        if (!isset($this->pearFilesIndex[$fileName]))
-            throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        if (!isset($this->pearFilesIndex[$fileName])) {
+                    throw new NonExistentArchiveFileException('File '.$fileName.' is not found in archive files list');
+        }
 
         return self::wrapStringInStream($this->tar->extractInString($fileName));
     }

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
      */
     public static function getInstallationInstruction()
     {
-        return 'install library [pear/archive_tar]: `composer require pear/archive_tar`' . "\n"  . ' and optionally php-extensions (zlib, bz2)';
+        return 'install library [pear/archive_tar]: `composer require pear/archive_tar`'."\n".' and optionally php-extensions (zlib, bz2)';
     }
 
     /**
@@ -160,7 +160,7 @@ 
                 $compression = 'lzma2';
                 break;
             case 'z':
-                $tar_aname = 'compress.lzw://' . $archiveFileName;
+                $tar_aname = 'compress.lzw://'.$archiveFileName;
                 break;
         }
 
@@ -217,7 +217,7 @@ 
 
             case Formats::TAR_LZW:
                 LzwStreamWrapper::registerWrapper();
-                $this->tar = new Archive_Tar('compress.lzw://' . $this->fileName);
+                $this->tar = new Archive_Tar('compress.lzw://'.$this->fileName);
                 break;
 
             default:
@@ -335,7 +335,7 @@ 
         $result = $this->tar->extractList($files, $outputFolder);
         if ($result === false) {
             if (isset($this->tar->error_object)) {
-                throw new ArchiveExtractionException('Error when extracting from ' . $this->fileName . ': ' . $this->tar->error_object->getMessage(0));
+                throw new ArchiveExtractionException('Error when extracting from '.$this->fileName.': '.$this->tar->error_object->getMessage(0));
             }
             throw new ArchiveExtractionException('Error when extracting from '.$this->fileName);
         }
@@ -351,7 +351,7 @@ 
         $result = $this->tar->extract($outputFolder);
         if ($result === false) {
             if (isset($this->tar->error_object)) {
-                throw new ArchiveExtractionException('Error when extracting ' . $this->fileName . ': '
+                throw new ArchiveExtractionException('Error when extracting '.$this->fileName.': '
                                                      . $this->tar->error_object->toString()
                 );
             }

src/Drivers/AlchemyZippy.php

Braces +11 added lines, -8 removed lines

@@ -61,10 +61,11 @@ 
 
     protected static function init()
     {
-        if (!class_exists('\Alchemy\Zippy\Zippy'))
-            static::$zippy = false;
-        else if (static::$zippy === null)
-            static::$zippy = Zippy::load();
+        if (!class_exists('\Alchemy\Zippy\Zippy')) {
+                    static::$zippy = false;
+        } else if (static::$zippy === null) {
+                    static::$zippy = Zippy::load();
+        }
     }
 
     /**
@@ -75,8 +76,9 @@ 
     {
         static::init();
 
-        if (static::$zippy === false)
-            return [];
+        if (static::$zippy === false) {
+                    return [];
+        }
 
         switch ($format) {
             case Formats::TAR_BZIP:
@@ -212,8 +214,9 @@ 
         $information = new ArchiveInformation();
 
         foreach ($this->archive->getMembers() as $member) {
-            if ($member->isDir())
-                continue;
+            if ($member->isDir()) {
+                            continue;
+            }
 
             $this->files[] = $information->files[] = str_replace('\\', '/', $member->getLocation());
             $this->members[str_replace('\\', '/', $member->getLocation())] = $member;

Spacing +7 added lines, -7 removed lines

@@ -63,9 +63,9 @@ 
     public static function getInstallationInstruction()
     {
         self::init();
-        return 'install library [alchemy/zippy]: `composer require alchemy/zippy`' . "\n"  . ' and console programs (tar, zip): `apt install tar zip` - depends on OS'
-            . "\n" . 'If you install SevenZip and AlchemyZippy:' . "\n" .
-            '1. You should specify symfony/console version before installation to any **3.x.x version**:' . "\n" . '`composer require symfony/process:~3.4`, because they require different `symfony/process` versions.' . "\n" .
+        return 'install library [alchemy/zippy]: `composer require alchemy/zippy`'."\n".' and console programs (tar, zip): `apt install tar zip` - depends on OS'
+            . "\n".'If you install SevenZip and AlchemyZippy:'."\n".
+            '1. You should specify symfony/console version before installation to any **3.x.x version**:'."\n".'`composer require symfony/process:~3.4`, because they require different `symfony/process` versions.'."\n".
             '2. Install archive7z version 4.0.0: `composer require gemorroj/archive7z:~4.0`';
     }
 
@@ -190,8 +190,8 @@ 
 
             $this->files[] = $information->files[] = str_replace('\\', '/', $member->getLocation());
             $this->members[str_replace('\\', '/', $member->getLocation())] = $member;
-            $information->compressedFilesSize += (int)$member->getSize();
-            $information->uncompressedFilesSize += (int)$member->getSize();
+            $information->compressedFilesSize += (int) $member->getSize();
+            $information->uncompressedFilesSize += (int) $member->getSize();
         }
         return $information;
     }
@@ -240,7 +240,7 @@ 
     public function getFileContent($fileName)
     {
         $member = $this->getMember($fileName);
-        return (string)$member;
+        return (string) $member;
     }
 
     /**
@@ -249,7 +249,7 @@ 
     public function getFileStream($fileName)
     {
         $member = $this->getMember($fileName);
-        return self::wrapStringInStream((string)$member);
+        return self::wrapStringInStream((string) $member);
     }
 
     /**

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

Spacing +10 added lines, -10 removed lines

@@ -63,7 +63,7 @@ 
     public static function open($fileName, $password = null, $abilities = [])
     {
         if (!file_exists($fileName) || !is_readable($fileName)) {
-            throw new InvalidArgumentException('Could not open file: ' . $fileName.' is not readable');
+            throw new InvalidArgumentException('Could not open file: '.$fileName.' is not readable');
         }
 
         $format = Formats::detectArchiveFormat($fileName);
@@ -278,7 +278,7 @@ 
     public function getFileData($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileData($fileName);
@@ -294,7 +294,7 @@ 
     public function getFileContent($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileContent($fileName);
@@ -310,7 +310,7 @@ 
     public function getFileStream($fileName)
     {
         if (!in_array($fileName, $this->files, true)) {
-            throw new NonExistentArchiveFileException('File ' . $fileName . ' does not exist in archive');
+            throw new NonExistentArchiveFileException('File '.$fileName.' does not exist in archive');
         }
 
         return $this->archive->getFileStream($fileName);
@@ -573,7 +573,7 @@ 
         /** @var BasicDriver $driver */
         $driver = Formats::getFormatDriver($info['type'], $abilities);
         if ($driver === null) {
-            throw new UnsupportedArchiveException('Unsupported archive type: ' . $info['type'] . ' of archive ');
+            throw new UnsupportedArchiveException('Unsupported archive type: '.$info['type'].' of archive ');
         }
 
         return $driver::createArchive(
@@ -600,7 +600,7 @@ 
     public static function archiveFile($file, $archiveName, $compressionLevel = BasicDriver::COMPRESSION_AVERAGE, $password = null)
     {
         if (!is_file($file)) {
-            throw new InvalidArgumentException($file . ' is not a valid file to archive');
+            throw new InvalidArgumentException($file.' is not a valid file to archive');
         }
 
         return static::archiveFiles($file, $archiveName, $compressionLevel, $password) === 1;
@@ -671,8 +671,8 @@ 
                 if (is_array($source)) {
                     foreach ($source as $sourceItem) {
                         static::importFilesFromDir(
-                            rtrim($sourceItem, '/\\*') . '/*',
-                            !empty($destination) ? $destination . '/' : null,
+                            rtrim($sourceItem, '/\\*').'/*',
+                            !empty($destination) ? $destination.'/' : null,
                             true,
                             $files
                         );
@@ -680,8 +680,8 @@ 
                 } else if (is_dir($source)) {
                     // one source for directories
                     static::importFilesFromDir(
-                        rtrim($source, '/\\*') . '/*',
-                        !empty($destination) ? $destination . '/' : null,
+                        rtrim($source, '/\\*').'/*',
+                        !empty($destination) ? $destination.'/' : null,
                         true,
                         $files
                     );

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;

src/Drivers/Zip.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public static function getDescription()
     {
-        return 'adapter for ext-zip'.(extension_loaded('zip') && defined('\ZipArchive::LIBZIP_VERSION') ? ' ('. ZipArchive::LIBZIP_VERSION.')' : null);
+        return 'adapter for ext-zip'.(extension_loaded('zip') && defined('\ZipArchive::LIBZIP_VERSION') ? ' ('.ZipArchive::LIBZIP_VERSION.')' : null);
     }
 
     public static function isInstalled()

Braces +36 added lines, -24 removed lines

@@ -86,8 +86,9 @@ 
     {
         parent::__construct($archiveFileName, $format);
         $this->open($archiveFileName);
-        if ($password !== null)
-            $this->zip->setPassword($password);
+        if ($password !== null) {
+                    $this->zip->setPassword($password);
+        }
     }
 
     /**
@@ -121,8 +122,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file = $this->zip->statIndex($i);
             // skip directories
-            if (in_array(substr($file['name'], -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file['name'], -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $this->pureFilesNumber++;
             $information->files[$i] = $file['name'];
             $information->compressedFilesSize += $file['comp_size'];
@@ -157,8 +159,9 @@ 
         for ($i = 0; $i < $this->zip->numFiles; $i++) {
             $file_name = $this->zip->getNameIndex($i);
             // skip directories
-            if (in_array(substr($file_name, -1), ['/', '\\'], true))
-                continue;
+            if (in_array(substr($file_name, -1), ['/', '\\'], true)) {
+                            continue;
+            }
             $files[] = $file_name;
         }
         return $files;
@@ -203,8 +206,9 @@ 
     public function getFileContent($fileName)
     {
         $result = $this->zip->getFromName($fileName);
-        if ($result === false)
-            throw new Exception('Could not get file information: '.$result.'. May use password?');
+        if ($result === false) {
+                    throw new Exception('Could not get file information: '.$result.'. May use password?');
+        }
         return $result;
     }
 
@@ -225,8 +229,9 @@ 
      */
     public function extractFiles($outputFolder, array $files)
     {
-        if ($this->zip->extractTo($outputFolder, $files) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder, $files) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return count($files);
     }
@@ -238,8 +243,9 @@ 
      */
     public function extractArchive($outputFolder)
     {
-        if ($this->zip->extractTo($outputFolder) === false)
-            throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        if ($this->zip->extractTo($outputFolder) === false) {
+                    throw new ArchiveExtractionException($this->zip->getStatusString(), $this->zip->status);
+        }
 
         return $this->pureFilesNumber;
     }
@@ -254,8 +260,9 @@ 
     {
         $count = 0;
         foreach ($files as $file) {
-            if ($this->zip->deleteName($file) === false)
-                throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            if ($this->zip->deleteName($file) === false) {
+                            throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+            }
             $count++;
         }
 
@@ -278,11 +285,13 @@ 
         $added_files = 0;
         foreach ($files as $localName => $fileName) {
             if (is_null($fileName)) {
-                if ($this->zip->addEmptyDir($localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
             } else {
-                if ($this->zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                if ($this->zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveModificationException($this->zip->getStatusString(), $this->zip->status);
+                }
                 $added_files++;
             }
         }
@@ -335,8 +344,9 @@ 
         $zip = new ZipArchive();
         $result = $zip->open($archiveFileName, ZipArchive::CREATE);
 
-        if ($result !== true)
-            throw new ArchiveCreationException('ZipArchive error: '.$result);
+        if ($result !== true) {
+                    throw new ArchiveCreationException('ZipArchive error: '.$result);
+        }
 
         $can_set_compression_level = method_exists($zip, 'setCompressionName');
         $can_encrypt = static::canEncrypt(Formats::ZIP);
@@ -354,11 +364,13 @@ 
 
         foreach ($files as $localName => $fileName) {
             if ($fileName === null) {
-                if ($zip->addEmptyDir($localName) === false)
-                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addEmptyDir($localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive directory "'.$localName.'": '.$zip->getStatusString(), $zip->status);
+                }
             } else {
-                if ($zip->addFile($fileName, $localName) === false)
-                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                if ($zip->addFile($fileName, $localName) === false) {
+                                    throw new ArchiveCreationException('Could not archive file "'.$fileName.'": '.$zip->getStatusString(), $zip->status);
+                }
                 if ($can_set_compression_level) {
                     $zip->setCompressionName($localName, $compressionLevelMap[$compressionLevel]);
                 }