wapmorgan / UnifiedArchive

src/Commands/ExtractFilesCommand.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $entry_selector = $input->getArgument('entrySelector');
 
         $archive->extract($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)');
 
         return 0;
     }

src/Drivers/OneFile/Lzma.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      */
     public static function getInstallationInstruction()
     {
-        return 'install [' . static::EXTENSION_NAME . '] extension' . "\n" . 'For 5.x: https://github.com/payden/php-xz' . "\n" . 'For 7.x/8.x: https://github.com/codemasher/php-ext-xz';
+        return 'install ['.static::EXTENSION_NAME.'] extension'."\n".'For 5.x: https://github.com/payden/php-xz'."\n".'For 7.x/8.x: https://github.com/codemasher/php-ext-xz';
     }
 
     /**

src/Drivers/OneFile/OneFileDriver.php

Spacing +2 added lines, -2 removed lines

@@ -50,10 +50,10 @@
     {
         $suffix = Formats::getFormatExtension(static::FORMAT);
         if ($suffix === null) {
-            throw new \Exception('Format suffix is empty for ' . static::FORMAT . ', it should be initialized!');
+            throw new \Exception('Format suffix is empty for '.static::FORMAT.', it should be initialized!');
         }
         if ($password !== null) {
-            throw new UnsupportedOperationException($suffix . ' archive does not support password!');
+            throw new UnsupportedOperationException($suffix.' archive does not support password!');
         }
 
         parent::__construct($archiveFileName, $format);

Braces +3 added lines, -2 removed lines

@@ -122,8 +122,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/Drivers/Basic/BasicExtensionDriver.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 
     public static function getInstallationInstruction()
     {
-        return 'install [' . static::EXTENSION_NAME . '] php extension';
+        return 'install ['.static::EXTENSION_NAME.'] php extension';
     }
 }

src/Drivers/Basic/BasicDriver.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
         do {
             $temp_file = tempnam(sys_get_temp_dir(), 'temp_archive');
             unlink($temp_file);
-            $archive_file =  $temp_file . '.' . $format_extension;
+            $archive_file = $temp_file.'.'.$format_extension;
         } while (file_exists($archive_file));
         $created = static::createArchive($files, $archive_file, $archiveFormat, $compressionLevel, $password, $fileProgressCallable);
         $string = file_get_contents($archive_file);

src/Drivers/Basic/BasicPureDriver.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 
     public static function getInstallationInstruction()
     {
-        return 'install library [ ' . static::PACKAGE_NAME . ']: `composer require ' . static::PACKAGE_NAME . '`';
+        return 'install library [ '.static::PACKAGE_NAME.']: `composer require '.static::PACKAGE_NAME.'`';
     }
 }

src/UnifiedArchive.php

Spacing +22 added lines, -22 removed lines

@@ -64,7 +64,7 @@ 
     public static function open($fileName, $abilities = [], $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);
@@ -121,7 +121,7 @@ 
         if ($archiveName !== null) {
             $archiveType = Formats::detectArchiveFormat($archiveName, false);
             if ($archiveType === false) {
-                throw new UnsupportedArchiveException('Could not detect archive type for name "' . $archiveName . '"');
+                throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
             }
         }
 
@@ -187,7 +187,7 @@ 
     )
     {
         if (file_exists($archiveName)) {
-            throw new FileAlreadyExistsException('Archive ' . $archiveName . ' already exists!');
+            throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
         }
 
         $info = static::prepareForArchiving($fileOrFiles, $archiveName);
@@ -262,7 +262,7 @@ 
     protected static function getCreationDriver($archiveFormat, $inString, $encrypted)
     {
         if (!Formats::canCreate($archiveFormat)) {
-            throw new UnsupportedArchiveException('Unsupported archive type: ' . $archiveFormat);
+            throw new UnsupportedArchiveException('Unsupported archive type: '.$archiveFormat);
         }
 
         $abilities = [BasicDriver::CREATE];
@@ -272,7 +272,7 @@ 
 
         if ($encrypted) {
             if (!Formats::canEncrypt($archiveFormat)) {
-                throw new UnsupportedOperationException('Archive type ' . $archiveFormat . ' can not be encrypted');
+                throw new UnsupportedOperationException('Archive type '.$archiveFormat.' can not be encrypted');
             }
             $abilities[] = BasicDriver::CREATE_ENCRYPTED;
         }
@@ -280,7 +280,7 @@ 
         /** @var BasicDriver $driver */
         $driver = Formats::getFormatDriver($archiveFormat, $abilities);
         if ($driver === null) {
-            throw new UnsupportedArchiveException('Unsupported archive type: ' . $archiveFormat . ' of archive ');
+            throw new UnsupportedArchiveException('Unsupported archive type: '.$archiveFormat.' of archive ');
         }
         return $driver;
     }
@@ -471,7 +471,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);
@@ -487,7 +487,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);
@@ -503,7 +503,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);
@@ -601,7 +601,7 @@ 
     public function addFile($file, $inArchiveName = null)
     {
         if (!is_file($file))
-            throw new InvalidArgumentException($file . ' is not a valid file to add in archive');
+            throw new InvalidArgumentException($file.' is not a valid file to add in archive');
 
         return ($inArchiveName !== null
                 ? $this->add([$inArchiveName => $file])
@@ -635,7 +635,7 @@ 
     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');
+            throw new InvalidArgumentException($directory.' is not a valid directory to add in archive');
 
         return ($inArchivePath !== null
                 ? $this->add([$inArchivePath => $directory])
@@ -678,7 +678,7 @@ 
         $newFiles = [];
         foreach ($files as $file) {
             foreach ($archiveFiles as $archiveFile) {
-                if (fnmatch($file . '*', $archiveFile)) {
+                if (fnmatch($file.'*', $archiveFile)) {
                     $newFiles[] = $archiveFile;
                 }
             }
@@ -713,8 +713,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
                         );
@@ -722,8 +722,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
                     );
@@ -735,7 +735,7 @@ 
         } else if (is_string($nodes)) { // passed one file or directory
             // if is directory
             if (is_dir($nodes))
-                static::importFilesFromDir(rtrim($nodes, '/\\*') . '/*', null, true,
+                static::importFilesFromDir(rtrim($nodes, '/\\*').'/*', null, true,
                     $files);
             else if (is_file($nodes))
                 $files[basename($nodes)] = $nodes;
@@ -760,10 +760,10 @@ 
 
         foreach (glob($source, GLOB_MARK) as $node) {
             if (in_array(substr($node, -1), ['/', '\\'], true) && $recursive) {
-                static::importFilesFromDir(str_replace('\\', '/', $node) . '*',
-                    $destination . basename($node) . '/', $recursive, $map);
+                static::importFilesFromDir(str_replace('\\', '/', $node).'*',
+                    $destination.basename($node).'/', $recursive, $map);
             } elseif (is_file($node) && is_readable($node)) {
-                $map[$destination . basename($node)] = $node;
+                $map[$destination.basename($node)] = $node;
             }
         }
     }
@@ -960,7 +960,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::create($file, $archiveName, $compressionLevel, $password) === 1;
@@ -981,7 +981,7 @@ 
     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');
+            throw new InvalidArgumentException($directory.' is not a valid directory to archive');
 
         return static::create($directory, $archiveName, $compressionLevel, $password) > 0;
     }

Braces +26 added lines, -19 removed lines

@@ -450,13 +450,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;
     }
@@ -600,8 +602,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])
@@ -634,8 +637,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])
@@ -698,9 +702,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];
@@ -734,11 +738,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;
@@ -755,8 +760,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) {
@@ -980,8 +986,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::create($directory, $archiveName, $compressionLevel, $password) > 0;
     }

src/Commands/CreateCommand.php

Spacing +16 added lines, -16 removed lines

@@ -53,7 +53,7 @@ 
         $password = $input->getOption('password');
         $compression = $input->getOption('compression');
         if (!isset(static::$compressionLevels[$compression])) {
-            throw new \InvalidArgumentException('Compression "' . $compression . '" is not valid');
+            throw new \InvalidArgumentException('Compression "'.$compression.'" is not valid');
         }
         $compression = static::$compressionLevels[$compression];
         $path = $input->getOption('path');
@@ -66,9 +66,9 @@ 
 
         if (file_exists($archive_file)) {
             if (is_dir($archive_file))
-                throw new \InvalidArgumentException($archive_file . ' is a directory!');
+                throw new \InvalidArgumentException($archive_file.' is a directory!');
             else {
-                throw new \InvalidArgumentException('File "' . $archive_file . '" already exists!');
+                throw new \InvalidArgumentException('File "'.$archive_file.'" already exists!');
             }
         }
 
@@ -82,7 +82,7 @@ 
                     $files_list[$destination] = $file_to_pack;
                     if (!$stdout) {
                         $output->writeln(
-                            '<comment>' . $file_to_pack . ' => ' . $destination . '</comment>',
+                            '<comment>'.$file_to_pack.' => '.$destination.'</comment>',
                             OutputInterface::VERBOSITY_VERBOSE
                         );
                     }
@@ -91,7 +91,7 @@ 
                     if (is_dir($file_to_pack)) {
                         if (!$stdout) {
                             $output->writeln(
-                                '<comment>' . $file_to_pack . ' => root</comment>',
+                                '<comment>'.$file_to_pack.' => root</comment>',
                                 OutputInterface::VERBOSITY_VERBOSE
                             );
                         }
@@ -105,7 +105,7 @@ 
                     } else {
                         if (!$stdout) {
                             $output->writeln(
-                                '<comment>' . $file_to_pack . ' => ' . basename($file_to_pack) . '</comment>',
+                                '<comment>'.$file_to_pack.' => '.basename($file_to_pack).'</comment>',
                                 OutputInterface::VERBOSITY_VERBOSE
                             );
                         }
@@ -117,7 +117,7 @@ 
                     $files_list[$destination] = $file_to_pack;
                     if (!$stdout) {
                         $output->writeln(
-                            '<comment>' . $file_to_pack . ' => ' . $destination . '</comment>',
+                            '<comment>'.$file_to_pack.' => '.$destination.'</comment>',
                             OutputInterface::VERBOSITY_VERBOSE
                         );
                     }
@@ -127,7 +127,7 @@ 
                     $files_list[$destination] = $file_to_pack;
                     if (!$stdout) {
                         $output->writeln(
-                            '<comment>' . $file_to_pack . ' => ' . $destination . '</comment>',
+                            '<comment>'.$file_to_pack.' => '.$destination.'</comment>',
                             OutputInterface::VERBOSITY_VERBOSE
                         );
                     }
@@ -137,16 +137,16 @@ 
 
         $information = UnifiedArchive::prepareForArchiving($files_list, $archive_file);
         if ($dry_run) {
-            $output->writeln('Format: <info>' . $information['type'] . '</info>');
-            $output->writeln('Original size: <info>' . implode($this->formatSize($information['totalSize'])) . '</info>');
-            $output->writeln('Files: <info>' . $information['numberOfFiles'] . '</info>');
+            $output->writeln('Format: <info>'.$information['type'].'</info>');
+            $output->writeln('Original size: <info>'.implode($this->formatSize($information['totalSize'])).'</info>');
+            $output->writeln('Files: <info>'.$information['numberOfFiles'].'</info>');
             foreach ($information['files'] as $destination => $source) {
                 // is folder
                 if ($source === null) {
                     continue;
                 }
 
-                $output->writeln($source . ' => <comment>' . $destination . '</comment>');
+                $output->writeln($source.' => <comment>'.$destination.'</comment>');
             }
             return 0;
         }
@@ -159,10 +159,10 @@ 
         $progressBar = new ProgressBar($output, $information['numberOfFiles']);
         $progressBar->setFormat('archiving');
         $progressBar->start();
-        $archived_files = UnifiedArchive::create($files_list, $archive_file, $compression, $password, function ($currentFile, $totalFiles, $fsFilename, $archiveFilename)
+        $archived_files = UnifiedArchive::create($files_list, $archive_file, $compression, $password, function($currentFile, $totalFiles, $fsFilename, $archiveFilename)
         use ($progressBar) {
             if ($fsFilename === null) {
-                $progressBar->setMessage('Creating ' . $archiveFilename);
+                $progressBar->setMessage('Creating '.$archiveFilename);
             } else {
                 $progressBar->setMessage($fsFilename);
             }
@@ -182,8 +182,8 @@ 
         }
 
         $output->writeln(
-            'Created <info>' . $archive_file . '</info> with <comment>' . $archived_files . '</comment> file(s) ('
-            . implode($this->formatSize($archive->getOriginalSize())) . ') of total size '
+            'Created <info>'.$archive_file.'</info> with <comment>'.$archived_files.'</comment> file(s) ('
+            . implode($this->formatSize($archive->getOriginalSize())).') of total size '
             . implode($this->formatSize(filesize($archive_file)))
         );
 

Braces +3 added lines, -3 removed lines

@@ -65,9 +65,9 @@
         $stdout = $input->getOption('stdout');
 
         if (file_exists($archive_file)) {
-            if (is_dir($archive_file))
-                throw new \InvalidArgumentException($archive_file . ' is a directory!');
-            else {
+            if (is_dir($archive_file)) {
+                            throw new \InvalidArgumentException($archive_file . ' is a directory!');
+            } else {
                 throw new \InvalidArgumentException('File "' . $archive_file . '" already exists!');
             }
         }

src/Formats.php

Braces +3 added lines, -2 removed lines

@@ -137,8 +137,9 @@
                 $complex_ext = substr($fileName, $sld_offset + 1);
                 if (isset(static::$twoLevelExtensions[$complex_ext])) {
                     return static::$twoLevelExtensions[$complex_ext];
-                } else
-                exit;
+                } else {
+                                exit;
+                }
             }
             if (isset(static::$oneLevelExtensions[$ext])) {
                 return static::$oneLevelExtensions[$ext];