wapmorgan / UnifiedArchive

src/Drivers/TarByPear.php

Braces +29 added lines, -19 removed lines

@@ -57,7 +57,9 @@ 
     public static function checkFormatSupport($format)
     {
         $availability = class_exists('\Archive_Tar');
-        if (!$availability) return false;
+        if (!$availability) {
+         return false;
+        }
         switch ($format) {
             case Formats::TAR:
                 return true;
@@ -140,10 +142,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);
@@ -152,11 +155,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]);
@@ -216,8 +221,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;
@@ -262,14 +268,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);
@@ -284,8 +292,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);
     }
@@ -295,8 +304,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));
     }

src/Drivers/SevenZip.php

Braces +30 added lines, -20 removed lines

@@ -58,12 +58,14 @@ 
     public static function checkFormatSupport($format)
     {
         $available = class_exists('\Archive7z\Archive7z') && Archive7z::getBinaryVersion() !== false;
-        if (!$available)
-            return false;
+        if (!$available) {
+                    return false;
+        }
 
         // in 4.0.0 version it was supporting only 7z
-        if (!Archive7z::supportsAllFormats())
-            return $format === Formats::SEVEN_ZIP;
+        if (!Archive7z::supportsAllFormats()) {
+                    return $format === Formats::SEVEN_ZIP;
+        }
 
         switch ($format) {
             case Formats::SEVEN_ZIP:
@@ -104,11 +106,13 @@ 
      */
     public static function getInstallationInstruction()
     {
-        if (!class_exists('\Archive7z\Archive7z'))
-            return 'install library `gemorroj/archive7z` and console program p7zip (7za)';
+        if (!class_exists('\Archive7z\Archive7z')) {
+                    return 'install library `gemorroj/archive7z` and console program p7zip (7za)';
+        }
 
-        if (Archive7z::getBinaryVersion() === false)
-            return 'install console program p7zip (7za)';
+        if (Archive7z::getBinaryVersion() === false) {
+                    return 'install console program p7zip (7za)';
+        }
 
         return null;
     }
@@ -121,8 +125,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);
         }
@@ -140,8 +145,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()
@@ -159,8 +165,9 @@ 
     {
         $files = [];
         foreach ($this->sevenZip->getEntries() as $entry) {
-            if ($entry->isDirectory())
-                continue;
+            if ($entry->isDirectory()) {
+                            continue;
+            }
             $files[] = $entry->getPath();
         }
         return $files;
@@ -301,8 +308,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);
@@ -352,8 +360,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) {
@@ -385,8 +394,9 @@ 
             Formats::TAR,
             Formats::LZMA,
             Formats::ZIP]
-        ))
-            return self::canRenameFiles();
+        )) {
+                    return self::canRenameFiles();
+        }
 
         return false;
     }

src/Drivers/OneFile/OneFileDriver.php

Braces +9 added lines, -6 removed lines

@@ -24,10 +24,12 @@ 
      */
     public function __construct($archiveFileName, $format, $password = null)
     {
-        if (static::FORMAT_SUFFIX === null)
-            throw new \Exception('Format should be initialized');
-        if ($password !== null)
-            throw new UnsupportedOperationException(self::FORMAT_SUFFIX.' archive does not support password!');
+        if (static::FORMAT_SUFFIX === null) {
+                    throw new \Exception('Format should be initialized');
+        }
+        if ($password !== null) {
+                    throw new UnsupportedOperationException(self::FORMAT_SUFFIX.' archive does not support password!');
+        }
 
         $this->fileName = $archiveFileName;
         $this->inArchiveFileName = basename($archiveFileName, '.'.static::FORMAT_SUFFIX);
@@ -95,8 +97,9 @@ 
     public function extractArchive($outputFolder)
     {
         $data = $this->getFileContent($this->inArchiveFileName);
-        if ($data === false)
-            throw new ArchiveExtractionException('Could not extract archive');
+        if ($data === false) {
+                    throw new ArchiveExtractionException('Could not extract archive');
+        }
 
         $size = strlen($data);
         $written = file_put_contents($outputFolder.$this->inArchiveFileName, $data);

src/UnifiedArchive.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
     public static function open($fileName, $password = null)
     {
         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);
@@ -272,7 +272,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);
@@ -288,7 +288,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);
@@ -304,7 +304,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);
@@ -559,7 +559,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;
@@ -630,8 +630,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
                         );
@@ -639,8 +639,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

@@ -251,13 +251,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;
     }
@@ -384,8 +386,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();
@@ -404,8 +407,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])
@@ -438,8 +442,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])
@@ -463,13 +468,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) {
@@ -521,16 +528,19 @@ 
         $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);
 
-        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');
+        }
 
         /** @var BasicDriver $driver */
         $driver = Formats::getFormatDriver($info['type'], true);
@@ -578,8 +588,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;
     }
@@ -615,9 +626,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];
@@ -651,11 +662,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;
@@ -672,8 +684,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/Commands/CommentCommand.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         }
 
         if (!empty($previous_comment = $archive->getComment())) {
-            $output->writeln('Comment "' . $previous_comment . '" replaced', OutputInterface::OUTPUT_RAW);
+            $output->writeln('Comment "'.$previous_comment.'" replaced', OutputInterface::OUTPUT_RAW);
         } else if ($comment === null) {
             $output->writeln('Comment deleted', OutputInterface::OUTPUT_RAW);
         } else {

src/Commands/ExtractArchiveCommand.php

Spacing +2 added lines, -2 removed lines

@@ -31,10 +31,10 @@
         $archive = $this->getArchive($input, $output);
 
         if (disk_free_space($output_dir) < $archive->getOriginalSize()) {
-            throw new \LogicException('Archive size ' . implode($this->formatSize($archive->getOriginalSize())) . ' is more that available on disk '
+            throw new \LogicException('Archive size '.implode($this->formatSize($archive->getOriginalSize())).' is more that available on disk '
                                       . implode($this->formatSize(disk_free_space($output_dir))));
         }
         $archive->extractFiles($output_dir, $entry_selector, true);
-        $output->writeln('<info>Extracted all archive contents (' . implode($this->formatSize($archive->getOriginalSize())) . ')</info>');
+        $output->writeln('<info>Extracted all archive contents ('.implode($this->formatSize($archive->getOriginalSize())).')</info>');
     }
 }

src/Commands/AddFileCommand.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
             if (empty($destination)) {
                 throw new \LogicException('Source and destination can not be empty');
             }
-            $output->writeln('<info>Read ' . $data_size . ' from input</info>');
+            $output->writeln('<info>Read '.$data_size.' from input</info>');
         } else {
             $data_size = filesize($source);
         }
@@ -75,9 +75,9 @@ 
         }
         if ($added_files === 1) {
             $details = $archive->getFileData($destination);
-            $output->writeln('Added <comment>' . $source . '</comment>('
-                             . implode($this->formatSize($data_size)) . ') as '
-                             . $destination . ' ('
+            $output->writeln('Added <comment>'.$source.'</comment>('
+                             . implode($this->formatSize($data_size)).') as '
+                             . $destination.' ('
                              . implode($this->formatSize($details->compressedSize))
                              . ')');
         }

src/Commands/InfoCommand.php

Spacing +7 added lines, -7 removed lines

@@ -26,14 +26,14 @@
         $file = realpath($input->getArgument('archive'));
         $archive = $this->getArchive($input, $output);
 
-        $output->writeln('Filename: ' . $file . ' (changed <comment>' . $this->formatDate(filemtime($file)) . '</comment>)');
-        $output->writeln('Type: <info>' . $archive->getFormat() . '</info>, mime <info>' . $archive->getMimeType() . '</info> (via driver <comment>' . $archive->getDriverType() . '</comment>)');
-        $output->writeln('Contains: ' . $archive->countFiles() . ' file' . ($archive->countFiles() > 1 ? 's' : null));
+        $output->writeln('Filename: '.$file.' (changed <comment>'.$this->formatDate(filemtime($file)).'</comment>)');
+        $output->writeln('Type: <info>'.$archive->getFormat().'</info>, mime <info>'.$archive->getMimeType().'</info> (via driver <comment>'.$archive->getDriverType().'</comment>)');
+        $output->writeln('Contains: '.$archive->countFiles().' file'.($archive->countFiles() > 1 ? 's' : null));
         $output->writeln('Size:');
-        $output->writeln("\t". 'uncompressed: '.implode(' ', $this->formatSize($archive->getOriginalSize(), 2)));
-        $output->writeln("\t" . 'compressed: ' . implode(' ', $this->formatSize($archive->getCompressedSize(), 2)));
-        $output->writeln("\t" . 'ratio: <info>' . round($archive->getOriginalSize() / $archive->getCompressedSize(), 6) . '/1 (' . floor($archive->getCompressedSize() / $archive->getOriginalSize() * 100) . '%</info>)');
+        $output->writeln("\t".'uncompressed: '.implode(' ', $this->formatSize($archive->getOriginalSize(), 2)));
+        $output->writeln("\t".'compressed: '.implode(' ', $this->formatSize($archive->getCompressedSize(), 2)));
+        $output->writeln("\t".'ratio: <info>'.round($archive->getOriginalSize() / $archive->getCompressedSize(), 6).'/1 ('.floor($archive->getCompressedSize() / $archive->getOriginalSize() * 100).'%</info>)');
         if (!empty($comment = $archive->getComment()))
-            $output->writeln('Comment: <comment>' . $comment . '</comment>');
+            $output->writeln('Comment: <comment>'.$comment.'</comment>');
     }
 }

Braces +3 added lines, -2 removed lines

@@ -33,7 +33,8 @@
         $output->writeln("\t". 'uncompressed: '.implode(' ', $this->formatSize($archive->getOriginalSize(), 2)));
         $output->writeln("\t" . 'compressed: ' . implode(' ', $this->formatSize($archive->getCompressedSize(), 2)));
         $output->writeln("\t" . 'ratio: <info>' . round($archive->getOriginalSize() / $archive->getCompressedSize(), 6) . '/1 (' . floor($archive->getCompressedSize() / $archive->getOriginalSize() * 100) . '%</info>)');
-        if (!empty($comment = $archive->getComment()))
-            $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        if (!empty($comment = $archive->getComment())) {
+                    $output->writeln('Comment: <comment>' . $comment . '</comment>');
+        }
     }
 }

src/Commands/ExtractFilesCommand.php

Spacing +1 added lines, -1 removed lines

@@ -33,6 +33,6 @@
         $entry_selector = $input->getArgument('entrySelector');
 
         $archive->extractFiles($output_dir, $entry_selector, true);
-        $output->writeln('<info>Extracted:</info> ' . implode(', ', $entry_selector) . ' (' . count($entry_selector) . ') file(s)');
+        $output->writeln('<info>Extracted:</info> '.implode(', ', $entry_selector).' ('.count($entry_selector).') file(s)');
     }
 }