wapmorgan / UnifiedArchive

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

Spacing +3 added lines, -3 removed lines

@@ -59,9 +59,9 @@ 
             foreach ($typeDrivers as $typeDriverClass => $typeDriverConfig) {
                 $type_messages = [];
                 if ($typeDriverConfig[1]) {
-                    $type_messages[] = '<info>' . $typeDriverClass . '</info>: ' . $typeDriverConfig[0];
+                    $type_messages[] = '<info>'.$typeDriverClass.'</info>: '.$typeDriverConfig[0];
                 } else {
-                    $type_messages[] = '<error>' . $typeDriverClass . '</error>: ' . $typeDriverConfig[0];
+                    $type_messages[] = '<error>'.$typeDriverClass.'</error>: '.$typeDriverConfig[0];
                     $type_messages[] = $this->formatInstallation($typeDriverConfig[2], 4);
                 }
                 $output->writeln($formatter->formatSection(
@@ -84,7 +84,7 @@ 
     protected function formatInstallation($doc, $leftPadding = 4)
     {
         return implode("\n", array_map(
-            function($line) use ($leftPadding) { return str_repeat(' ', $leftPadding) . $line; },
+            function($line) use ($leftPadding) { return str_repeat(' ', $leftPadding).$line; },
             explode(
                 "\n",
                 preg_replace('~`(.+?)`~', '<options=bold,underscore>$1</>', $doc)

src/Drivers/OneFile/Bzip.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 class Bzip extends OneFileDriver
 {
-    const FORMAT_SUFFIX =  'bz2';
+    const FORMAT_SUFFIX = 'bz2';
     const PHP_EXTENSION = 'bz2';
     const FORMAT = Formats::BZIP;
 

src/Drivers/OneFile/Lzma.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
  */
 class Lzma extends OneFileDriver
 {
-    const FORMAT_SUFFIX =  'xz';
+    const FORMAT_SUFFIX = 'xz';
     const PHP_EXTENSION = 'xz';
     const FORMAT = Formats::LZMA;
 
@@ -30,7 +30,7 @@ 
      */
     public static function getInstallationInstruction()
     {
-        return 'install [xz] 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 [xz] 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/Commands/FormatsCommand.php

Spacing +7 added lines, -7 removed lines

@@ -33,19 +33,19 @@ 
 
         if ($driver !== null) {
             if (strpos($driver, '\\') === false) {
-                if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\' . $driver)) {
-                    $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\' . $driver;
-                } else if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\' . $driver)) {
-                    $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\' . $driver;
+                if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\'.$driver)) {
+                    $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\'.$driver;
+                } else if (class_exists('\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\'.$driver)) {
+                    $driver = '\\wapmorgan\\UnifiedArchive\\Drivers\\OneFile\\'.$driver;
                 }
             }
             if ($driver[0] !== '\\') {
                 $driver = '\\'.$driver;
             }
             if (!class_exists($driver) || !is_a($driver, BasicDriver::class, true)) {
-                throw new \InvalidArgumentException('Class "' . $driver . '" not found or not in BasicDriver children');
+                throw new \InvalidArgumentException('Class "'.$driver.'" not found or not in BasicDriver children');
             }
-            $output->writeln('Supported formats by <info>' . $driver . '</info>');
+            $output->writeln('Supported formats by <info>'.$driver.'</info>');
 
             $table->setHeaders(['format', ...array_keys(self::$abilitiesLabels)]);
             foreach ($driver::getSupportedFormats() as $i => $format) {
@@ -91,7 +91,7 @@ 
         $table->render();
 
         foreach (array_combine(array_values(self::$abilitiesShortCuts), array_keys(self::$abilitiesLabels)) as $shortCut => $label) {
-            $output->writeln('<info>' . $shortCut . '</info> - ' . $label);
+            $output->writeln('<info>'.$shortCut.'</info> - '.$label);
         }
 
         return 0;