wapmorgan / UnifiedArchive

src/Commands/BaseCommand.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
     {
         if (!UnifiedArchive::canOpen($file, !empty($password))) {
             throw new \Exception(
-                'Could not open archive ' . $file . '. Try installing suggested packages or run `cam -f` to see formats support.'
+                'Could not open archive '.$file.'. Try installing suggested packages or run `cam -f` to see formats support.'
             );
         }
 
@@ -92,10 +92,10 @@ 
     protected function resolveDriverName($driver)
     {
         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] !== '\\') {

Braces +13 added lines, -11 removed lines

@@ -25,8 +25,9 @@ 
         }
 
         $archive = UnifiedArchive::open($file, [], $password);
-        if ($archive === null)
-            throw new \Exception('Could not open archive '.$file);
+        if ($archive === null) {
+                    throw new \Exception('Could not open archive '.$file);
+        }
 
         return $archive;
     }
@@ -39,17 +40,18 @@ 
      */
     public function formatDate($unixtime)
     {
-        if (strtotime('today') < $unixtime)
-            return 'Today, '.date('G:m', $unixtime);
-        else if (strtotime('yesterday') < $unixtime)
-            return 'Yesterday, '.date('G:m', $unixtime);
-        else {
+        if (strtotime('today') < $unixtime) {
+                    return 'Today, '.date('G:m', $unixtime);
+        } else if (strtotime('yesterday') < $unixtime) {
+                    return 'Yesterday, '.date('G:m', $unixtime);
+        } else {
             $datetime = new \DateTime();
             $datetime->setTimestamp($unixtime);
-            if ($datetime->format('Y') == date('Y'))
-                return $datetime->format('d M, H:m');
-            else
-                return $datetime->format('d M Y, H:m');
+            if ($datetime->format('Y') == date('Y')) {
+                            return $datetime->format('d M, H:m');
+            } else {
+                            return $datetime->format('d M Y, H:m');
+            }
         }
     }
 

src/Commands/FormatsCommand.php

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@ 
         if ($driver !== null) {
             $driver = $this->resolveDriverName($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>');
 
             $headers = array_keys(Abilities::$abilitiesLabels);
             array_unshift($headers, 'format');
@@ -91,7 +91,7 @@ 
         foreach (array_combine(array_values(Abilities::$abilitiesShortCuts), array_keys(
             Abilities::$abilitiesLabels
         )) as $shortCut => $label) {
-            $output->writeln('<info>' . $shortCut . '</info> - ' . $label);
+            $output->writeln('<info>'.$shortCut.'</info> - '.$label);
         }
 
         return 0;

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);
         $headers = array_keys(Abilities::$abilitiesLabels);

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;
     }
@@ -294,10 +294,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)
                 )
@@ -489,7 +489,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);
@@ -505,7 +505,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);
@@ -521,7 +521,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);
@@ -656,7 +656,7 @@ 
         $newFiles = [];
         foreach ($files as $file) {
             foreach ($archiveFiles as $archiveFile) {
-                if (fnmatch($file . '*', $archiveFile)) {
+                if (fnmatch($file.'*', $archiveFile)) {
                     $newFiles[] = $archiveFile;
                 }
             }
@@ -689,8 +689,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
                         );
@@ -698,8 +698,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
                     );
@@ -711,9 +711,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
@@ -742,10 +742,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;
             }
         }
     }
@@ -964,7 +964,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;
@@ -985,7 +985,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;
     }
@@ -1147,7 +1147,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])
@@ -1168,7 +1168,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])