wapmorgan / UnifiedArchive

src/UnifiedArchive.php

Spacing +26 added lines, -26 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);
@@ -112,7 +112,7 @@ 
         if ($archiveName !== null) {
             $archiveType = Formats::detectArchiveFormat($archiveName, false);
             if ($archiveType === null) {
-                throw new UnsupportedArchiveException('Could not detect archive type for name "' . $archiveName . '"');
+                throw new UnsupportedArchiveException('Could not detect archive type for name "'.$archiveName.'"');
             }
         }
 
@@ -178,7 +178,7 @@ 
     )
     {
         if (file_exists($archiveName)) {
-            throw new FileAlreadyExistsException('Archive ' . $archiveName . ' already exists!');
+            throw new FileAlreadyExistsException('Archive '.$archiveName.' already exists!');
         }
 
         $info = static::prepareForArchiving($fileOrFiles, $archiveName);
@@ -229,7 +229,7 @@ 
         $fileProgressCallable = null
     )
     {
-        $info = static::prepareForArchiving($fileOrFiles, '.' . Formats::getFormatExtension($archiveFormat));
+        $info = static::prepareForArchiving($fileOrFiles, '.'.Formats::getFormatExtension($archiveFormat));
         try {
             $driver = static::getCreationDriver($archiveFormat, true, $password !== null);
         } catch (UnsupportedArchiveException $e) {
@@ -253,7 +253,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 = [Abilities::CREATE];
@@ -263,7 +263,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[] = Abilities::CREATE_ENCRYPTED;
         }
@@ -271,7 +271,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;
     }
@@ -295,10 +295,10 @@ 
             $driver = Formats::getFormatDriver($format, $abilities);
             if ($driver === null) {
                 throw new UnsupportedArchiveException(
-                    'Format ' . $format . ' driver with abilities ('
+                    'Format '.$format.' driver with abilities ('
                     . implode(
                         ', ',
-                        array_map(function ($ability) {
+                        array_map(function($ability) {
                             return array_search($ability, Abilities::$abilitiesLabels);
                         }, $abilities)
                     )
@@ -492,7 +492,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);
@@ -508,7 +508,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);
@@ -524,7 +524,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);
@@ -659,7 +659,7 @@ 
         $newFiles = [];
         foreach ($files as $file) {
             foreach ($archiveFiles as $archiveFile) {
-                if (fnmatch($file . '*', $archiveFile)) {
+                if (fnmatch($file.'*', $archiveFile)) {
                     $newFiles[] = $archiveFile;
                 }
             }
@@ -692,8 +692,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
                         );
@@ -701,8 +701,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
                     );
@@ -714,9 +714,9 @@ 
         } else if (is_string($nodes)) { // passed one file or directory
             // if is directory
             if (is_dir($nodes)) {
-                $nodes = rtrim($nodes, '/\\*') . '/';
+                $nodes = rtrim($nodes, '/\\*').'/';
                 static::importFilesFromDir(
-                    $nodes . '*',
+                    $nodes.'*',
                     $nodes,
                     true,
                     $files
@@ -745,10 +745,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;
             }
         }
     }
@@ -967,7 +967,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;
@@ -988,7 +988,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;
     }
@@ -1150,7 +1150,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])
@@ -1171,7 +1171,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])