sebastianfeldmann / phpbu

src/Backup/Sync/Rsync.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
         $result->debug($rsync->getCmd());
 
         if (!$rsync->isSuccessful()) {
-            throw new Exception('rsync failed: ' . $rsync->getStdErr());
+            throw new Exception('rsync failed: '.$rsync->getStdErr());
         }
     }
 
@@ -72,7 +72,7 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup with rsync' . PHP_EOL
+            'sync backup with rsync'.PHP_EOL
             . $this->getExecutable($target)->getCommandPrintable()
         );
     }

src/Backup/Target.php

Spacing +8 added lines, -8 removed lines

@@ -179,7 +179,7 @@ 
                 $this->pathElementsChanging[] = $d;
                 $foundChangingElement         = true;
             } else {
-                $this->pathNotChanging .= DIRECTORY_SEPARATOR . $d;
+                $this->pathNotChanging .= DIRECTORY_SEPARATOR.$d;
             }
         }
     }
@@ -271,7 +271,7 @@ 
      */
     public function getFilename(bool $plain = false) : string
     {
-        return $this->filename . $this->getFilenameSuffix($plain);
+        return $this->filename.$this->getFilenameSuffix($plain);
     }
 
     /**
@@ -292,7 +292,7 @@ 
      */
     public function getFilenameRaw($plain = false) : string
     {
-        return $this->filenameRaw . $this->getFilenameSuffix($plain);
+        return $this->filenameRaw.$this->getFilenameSuffix($plain);
     }
 
     /**
@@ -303,7 +303,7 @@ 
      */
     public function getFilenameSuffix($plain = false) : string
     {
-        return $this->getSuffixToAppend() . ($plain ? '' : $this->getCompressionSuffix() . $this->getCrypterSuffix());
+        return $this->getSuffixToAppend().($plain ? '' : $this->getCompressionSuffix().$this->getCrypterSuffix());
     }
 
     /**
@@ -313,7 +313,7 @@ 
      */
     public function getSuffixToAppend() : string
     {
-        return count($this->fileSuffixes) ? '.' . implode('.', $this->fileSuffixes) : '';
+        return count($this->fileSuffixes) ? '.'.implode('.', $this->fileSuffixes) : '';
     }
 
     /**
@@ -323,7 +323,7 @@ 
      */
     public function getCompressionSuffix() : string
     {
-        return $this->shouldBeCompressed() ? '.' . $this->compression->getSuffix() : '';
+        return $this->shouldBeCompressed() ? '.'.$this->compression->getSuffix() : '';
     }
 
     /**
@@ -333,7 +333,7 @@ 
      */
     public function getCrypterSuffix() : string
     {
-        return $this->shouldBeEncrypted() ? '.' . $this->crypter->getSuffix() : '';
+        return $this->shouldBeEncrypted() ? '.'.$this->crypter->getSuffix() : '';
     }
 
     /**
@@ -406,7 +406,7 @@ 
      */
     public function getPathname(bool $plain = false) : string
     {
-        return $this->path . DIRECTORY_SEPARATOR . $this->getFilename($plain);
+        return $this->path.DIRECTORY_SEPARATOR.$this->getFilename($plain);
     }
 
     /**

src/Configuration/Finder.php

Spacing +2 added lines, -2 removed lines

@@ -64,11 +64,11 @@
     protected function findConfigurationInDir(string $path) : string
     {
         foreach ($this->defaultConfigNames as $file) {
-            $configurationFile = $path . DIRECTORY_SEPARATOR . $file;
+            $configurationFile = $path.DIRECTORY_SEPARATOR.$file;
             if (file_exists($configurationFile)) {
                 return realpath($configurationFile);
             }
         }
-        throw new Exception('Can\'t find configuration in directory \'' . $path . '\'.');
+        throw new Exception('Can\'t find configuration in directory \''.$path.'\'.');
     }
 }

src/Runner/Bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         if (!empty($filename)) {
             $pathToFile = stream_resolve_include_path($filename);
             if (!$pathToFile || !is_readable($pathToFile)) {
-                throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename));
+                throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename));
             }
             require $pathToFile;
         }

src/Log/Mail.php

Spacing +74 added lines, -74 removed lines

@@ -148,8 +148,8 @@ 
         $mails                 = $options['recipients'];
         $server                = gethostname();
         $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false);
-        $this->subject         = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server);
-        $this->senderMail      = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server);
+        $this->subject         = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server);
+        $this->senderMail      = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server);
         $this->senderName      = Arr::getValue($options, 'sender.name');
         $this->transportType   = Arr::getValue($options, 'transport', 'mail');
         $this->recipients      = array_map('trim', explode(';', $mails));
@@ -176,14 +176,14 @@ 
             $errors  = $this->getErrorHtml($result);
             $info    = $this->getInfoHtml($result);
             $footer  = $this->getFooterHtml();
-            $body    = '<html><body '. TPL::getSnippet('sBody') . '>'
+            $body    = '<html><body '.TPL::getSnippet('sBody').'>'
                      . $header
                      . $status
                      . $errors
                      . $info
                      . $footer
                      . '</body></html>';
-            $sent    = null;
+            $sent = null;
 
             try {
                 /** @var \Swift_Message $message */
@@ -327,9 +327,9 @@ 
     {
         if (isset($options['sendmail.path'])) {
             $path    = $options['sendmail.path'];
-            $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
+            $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
             /* @var $transport \Swift_SendmailTransport */
-            return \Swift_SendmailTransport::newInstance($path . $options);
+            return \Swift_SendmailTransport::newInstance($path.$options);
         }
         return \Swift_SendmailTransport::newInstance();
     }
@@ -341,8 +341,8 @@ 
      */
     protected function getHeaderHtml()
     {
-        return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
-               '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
+        return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'.
+               '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>';
     }
 
     /**
@@ -379,12 +379,12 @@ 
             $this->numCleanups,
             Str::appendPluralS('cleanup', $this->numCleanups)
         );
-        $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
-                 '<tr><td>' .
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
-                  '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
-                 '</td></tr>' .
+        $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'.
+                 '<tr><td>'.
+                  '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'.
+                  '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'.
+                  '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'.
+                 '</td></tr>'.
                 '</table>';
 
         return $html;
@@ -401,17 +401,17 @@ 
         $html   = '';
         $errors = $result->getErrors();
         if (count($errors)) {
-            $html .= '<table ' . TPL::getSnippet('sTableError') . '>';
+            $html .= '<table '.TPL::getSnippet('sTableError').'>';
             /* @var $e Exception */
             foreach ($errors as $e) {
-                $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' .
+                $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'.
                     sprintf(
                         "Exception '%s' with message '%s' in %s:%d",
                         get_class($e),
                         $e->getMessage(),
                         $e->getFile(),
                         $e->getLine()
-                    ) .
+                    ).
                     '</td></tr>';
 
             }
@@ -431,78 +431,78 @@ 
         $html    = '';
         $backups = $result->getBackups();
         if (count($backups)) {
-            $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>';
+            $html .= '<table '.TPL::getSnippet('sTableBackup').'>';
             /** @var \phpbu\App\Result\Backup $backup */
             foreach ($backups as $backup) {
                 if ($backup->allOk()) {
                     $color  = TPL::getSnippet('cStatusOK');
                     $status = 'OK';
-                } elseif($backup->okButSkipsOrFails()) {
+                } elseif ($backup->okButSkipsOrFails()) {
                     $color  = TPL::getSnippet('cStatusWARN');
                     $status = 'WARNING';
                 } else {
                     $color  = TPL::getSnippet('cStatusFAIL');
                     $status = 'FAILURE';
                 }
-                $html .= '<tr>' .
-                          '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
-                          sprintf('backup <em>%s</em>', $backup->getName()) .
-                          ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . '>&nbsp;</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
+                $html .= '<tr>'.
+                          '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'.
+                          sprintf('backup <em>%s</em>', $backup->getName()).
+                          ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'.
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowHead').'>&nbsp;</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'.
                          '</tr>';
 
-                $html .= '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
-                            $backup->checkCount() . '
+                $html .= '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'.
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
+                            $backup->checkCount().'
                            </td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">
                             &nbsp;
                            </td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
-                            $backup->checkCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCount() . '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCountFailed() .
-                          '</td>' .
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
+                            $backup->checkCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCount().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCount().'</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCount().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCountFailed().
+                          '</td>'.
                          '</tr>';
 
             }
@@ -518,7 +518,7 @@ 
      */
     protected function getFooterHtml()
     {
-        return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
+        return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'.
                '</td></tr></table>';
     }
 }

src/Cmd.php

Spacing +16 added lines, -16 removed lines

@@ -97,7 +97,7 @@ 
                 $ret = self::EXIT_EXCEPTION;
             }
         } catch (\Exception $e) {
-            echo $e->getMessage() . PHP_EOL;
+            echo $e->getMessage().PHP_EOL;
             $ret = self::EXIT_EXCEPTION;
         }
 
@@ -237,7 +237,7 @@ 
     {
         $value = Arr::getValue($this->arguments, $arg);
         if (!empty($value)) {
-            $setter = 'set' . ucfirst($arg);
+            $setter = 'set'.ucfirst($arg);
             $configuration->{$setter}($value);
         }
     }
@@ -252,21 +252,21 @@ 
         // check if upgrade is necessary
         $latestVersion = $this->getLatestVersion();
         if (!$this->isPharOutdated($latestVersion)) {
-            echo 'You already have the latest version of phpbu installed.' . PHP_EOL;
+            echo 'You already have the latest version of phpbu installed.'.PHP_EOL;
             exit(self::EXIT_SUCCESS);
         }
 
         $remoteFilename = 'http://phar.phpbu.de/phpbu.phar';
         $localFilename  = realpath($_SERVER['argv'][0]);
-        $tempFilename   = basename($localFilename, '.phar') . '-temp.phar';
+        $tempFilename   = basename($localFilename, '.phar').'-temp.phar';
 
-        echo 'Updating the phpbu PHAR to version ' . $latestVersion . ' ... ';
+        echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... ';
 
         $old  = error_reporting(0);
         $phar = file_get_contents($remoteFilename);
         error_reporting($old);
         if (!$phar) {
-            echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL;
+            echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL;
             exit(self::EXIT_EXCEPTION);
         }
         file_put_contents($tempFilename, $phar);
@@ -282,11 +282,11 @@ 
         } catch (Exception $e) {
             // cleanup crappy phar
             unlink($tempFilename);
-            echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL;
+            echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL;
             exit(self::EXIT_EXCEPTION);
         }
 
-        echo 'done' . PHP_EOL;
+        echo 'done'.PHP_EOL;
         exit(self::EXIT_SUCCESS);
     }
 
@@ -299,10 +299,10 @@ 
 
         $latestVersion = $this->getLatestVersion();
         if ($this->isPharOutdated($latestVersion)) {
-            print 'You are not using the latest version of phpbu.' . PHP_EOL
-                . 'Use "phpunit --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
+            print 'You are not using the latest version of phpbu.'.PHP_EOL
+                . 'Use "phpunit --self-update" to install phpbu '.$latestVersion.PHP_EOL;
         } else {
-            print 'You are using the latest version of phpbu.' . PHP_EOL;
+            print 'You are using the latest version of phpbu.'.PHP_EOL;
         }
         exit(self::EXIT_SUCCESS);
     }
@@ -319,7 +319,7 @@ 
         $version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu');
         error_reporting($old);
         if (!$version) {
-            echo 'Network-Error: Could not check latest version.' . PHP_EOL;
+            echo 'Network-Error: Could not check latest version.'.PHP_EOL;
             exit(self::EXIT_EXCEPTION);
         }
         return $version;
@@ -345,7 +345,7 @@ 
             return;
         }
 
-        echo Version::getVersionString() . PHP_EOL . PHP_EOL;
+        echo Version::getVersionString().PHP_EOL.PHP_EOL;
         $this->isVersionStringPrinted = true;
     }
 
@@ -370,8 +370,8 @@ 
 
 EOT;
         if ($this->isPhar) {
-            echo '  --version-check        Check whether phpbu is up to date.' . PHP_EOL;
-            echo '  --self-update          Upgrade phpbu to the latest version.' . PHP_EOL;
+            echo '  --version-check        Check whether phpbu is up to date.'.PHP_EOL;
+            echo '  --self-update          Upgrade phpbu to the latest version.'.PHP_EOL;
         }
     }
 
@@ -385,7 +385,7 @@ 
     {
         $help = $hint ? ', use "phpbu -h" for help' : '';
         $this->printVersionString();
-        echo $message . $help . PHP_EOL;
+        echo $message.$help.PHP_EOL;
         exit(self::EXIT_EXCEPTION);
     }
 

src/Cmd/Args.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
     public function __construct(bool $isPhar = false)
     {
         if ($isPhar) {
-            $this->longOptions['self-update']  = true;
+            $this->longOptions['self-update'] = true;
             $this->longOptions['version-check'] = true;
         }
     }
@@ -102,9 +102,9 @@ 
     public function parseShortOption($arg, array &$options)
     {
         if (!isset($this->shortOptions[$arg])) {
-            throw new Exception('unknown option: -' . $arg);
+            throw new Exception('unknown option: -'.$arg);
         }
-        $options['-' . $arg] = true;
+        $options['-'.$arg] = true;
     }
 
     /**
@@ -124,17 +124,17 @@ 
             $argument = $list[1];
         }
         if (count($list) > 2) {
-            throw new Exception('invalid value for option: --' . $arg);
+            throw new Exception('invalid value for option: --'.$arg);
         }
-        if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) {
-            throw new Exception('unknown option: --' . $option);
+        if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) {
+            throw new Exception('unknown option: --'.$option);
         }
-        if ($argument === true && isset($this->longOptions[$option . '='])) {
-            throw new Exception('argument required for option: --' . $option);
+        if ($argument === true && isset($this->longOptions[$option.'='])) {
+            throw new Exception('argument required for option: --'.$option);
         }
         if ($argument !== true && isset($this->longOptions[$option])) {
-            throw new Exception('needless argument for option: --' . $option);
+            throw new Exception('needless argument for option: --'.$option);
         }
-        $options['--' . $option] = $argument;
+        $options['--'.$option] = $argument;
     }
 }

src/Result/PrinterCli.php

Spacing +36 added lines, -36 removed lines

@@ -162,8 +162,8 @@ 
         $configuration = $event->getConfiguration();
         if ($this->verbose) {
             $this->write(
-                'Runtime:       ' . $this->runtime->getNameWithVersion() . PHP_EOL .
-                'Configuration: ' . $configuration->getFilename() . PHP_EOL .
+                'Runtime:       '.$this->runtime->getNameWithVersion().PHP_EOL.
+                'Configuration: '.$configuration->getFilename().PHP_EOL.
                 PHP_EOL
             );
         }
@@ -179,7 +179,7 @@ 
         $this->numBackups++;
         if ($this->debug) {
             $backup = $event->getConfiguration();
-            $this->writeWithAsterisk('backup: [' . $backup->getSource()->type . '] ');
+            $this->writeWithAsterisk('backup: ['.$backup->getSource()->type.'] ');
         }
     }
 
@@ -191,7 +191,7 @@ 
     public function onBackupFailed(Event\Backup\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -203,7 +203,7 @@ 
     public function onBackupEnd(Event\Backup\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -217,8 +217,8 @@ 
         $this->numChecks++;
         if ($this->debug) {
             $check = $event->getConfiguration();
-            $this->writeWithAsterisk('check: [' . $check->type . '] ');
-            $this->write('checking: [' . $check->value . '] ');
+            $this->writeWithAsterisk('check: ['.$check->type.'] ');
+            $this->write('checking: ['.$check->value.'] ');
         }
     }
 
@@ -230,7 +230,7 @@ 
     public function onCheckFailed(Event\Check\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -242,7 +242,7 @@ 
     public function onCheckEnd(Event\Check\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -256,7 +256,7 @@ 
         $this->numCrypts++;
         if ($this->debug) {
             $crypt = $event->getConfiguration();
-            $this->writeWithAsterisk('crypt: [' . $crypt->type . '] ');
+            $this->writeWithAsterisk('crypt: ['.$crypt->type.'] ');
         }
     }
 
@@ -268,7 +268,7 @@ 
     public function onCryptSkipped(Event\Crypt\Skipped $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL);
         }
     }
 
@@ -280,7 +280,7 @@ 
     public function onCryptFailed(Event\Crypt\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -292,7 +292,7 @@ 
     public function onCryptEnd(Event\Crypt\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -306,7 +306,7 @@ 
         $this->numSyncs++;
         if ($this->debug) {
             $sync = $event->getConfiguration();
-            $this->writeWithAsterisk('sync: [' . $sync->type . '] ');
+            $this->writeWithAsterisk('sync: ['.$sync->type.'] ');
         }
     }
 
@@ -318,7 +318,7 @@ 
     public function onSyncSkipped(Event\Sync\Skipped $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL);
         }
     }
 
@@ -330,7 +330,7 @@ 
     public function onSyncFailed(Event\Sync\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -342,7 +342,7 @@ 
     public function onSyncEnd(Event\Sync\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -356,7 +356,7 @@ 
         $this->numCleanups++;
         if ($this->debug) {
             $cleanup = $event->getConfiguration();
-            $this->writeWithAsterisk('cleanup: [' . $cleanup->type . '] ');
+            $this->writeWithAsterisk('cleanup: ['.$cleanup->type.'] ');
         }
     }
 
@@ -368,7 +368,7 @@ 
     public function onCleanupSkipped(Event\Cleanup\Skipped $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL);
         }
     }
 
@@ -380,7 +380,7 @@ 
     public function onCleanupFailed(Event\Cleanup\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -392,7 +392,7 @@ 
     public function onCleanupEnd(Event\Cleanup\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -404,7 +404,7 @@ 
     public function onDebug(Event\Debug $event)
     {
         if ($this->debug) {
-            $this->write($event->getMessage() . PHP_EOL);
+            $this->write($event->getMessage().PHP_EOL);
         }
     }
 
@@ -442,7 +442,7 @@ 
      */
     protected function printHeader()
     {
-        $this->write(PHP_Timer::resourceUsage() . PHP_EOL . PHP_EOL);
+        $this->write(PHP_Timer::resourceUsage().PHP_EOL.PHP_EOL);
     }
 
     /**
@@ -502,13 +502,13 @@ 
         $clSkipped  = str_pad($backup->cleanupCountSkipped(), 7, ' ', STR_PAD_LEFT);
         $clFailed   = str_pad($backup->cleanupCountFailed(), 6, ' ', STR_PAD_LEFT);
 
-        $out = PHP_EOL . '          | executed | skipped | failed |' . PHP_EOL
-            . '----------+----------+---------+--------+' . PHP_EOL
-            . ' checks   | ' . $chExecuted . ' |         | ' . $chFailed . ' |' . PHP_EOL
-            . ' crypts   | ' . $crExecuted . ' | ' . $crSkipped . ' | ' . $crFailed . ' |' . PHP_EOL
-            . ' syncs    | ' . $syExecuted . ' | ' . $sySkipped . ' | ' . $syFailed . ' |' . PHP_EOL
-            . ' cleanups | ' . $clExecuted . ' | ' . $clSkipped . ' | ' . $clFailed . ' |' . PHP_EOL
-            . '----------+----------+---------+--------+' . PHP_EOL . PHP_EOL;
+        $out = PHP_EOL.'          | executed | skipped | failed |'.PHP_EOL
+            . '----------+----------+---------+--------+'.PHP_EOL
+            . ' checks   | '.$chExecuted.' |         | '.$chFailed.' |'.PHP_EOL
+            . ' crypts   | '.$crExecuted.' | '.$crSkipped.' | '.$crFailed.' |'.PHP_EOL
+            . ' syncs    | '.$syExecuted.' | '.$sySkipped.' | '.$syFailed.' |'.PHP_EOL
+            . ' cleanups | '.$clExecuted.' | '.$clSkipped.' | '.$clFailed.' |'.PHP_EOL
+            . '----------+----------+---------+--------+'.PHP_EOL.PHP_EOL;
 
         $this->write($out);
     }
@@ -529,7 +529,7 @@ 
             $this->writeWithColor(
                 'fg-green',
                 sprintf(
-                    'OK (%d %s, %d %s, %d %s, %d %s, %d %s)' . PHP_EOL,
+                    'OK (%d %s, %d %s, %d %s, %d %s, %d %s)'.PHP_EOL,
                     count($result->getBackups()),
                     Util\Str::appendPluralS('backup', count($result->getBackups())),
                     $this->numChecks,
@@ -546,8 +546,8 @@ 
             $this->writeWithColor(
                 'fg-yellow',
                 sprintf(
-                    "WARNING, skipped|failed Crypts, Syncs or Cleanups!" . PHP_EOL .
-                    'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d ' . PHP_EOL,
+                    "WARNING, skipped|failed Crypts, Syncs or Cleanups!".PHP_EOL.
+                    'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d '.PHP_EOL,
                     count($result->getBackups()),
                     $result->cryptsSkippedCount(),
                     $result->cryptsFailedCount(),
@@ -561,8 +561,8 @@ 
             $this->writeWithColor(
                 'fg-red',
                 sprintf(
-                    "FAILURE!" . PHP_EOL .
-                    'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.' . PHP_EOL,
+                    "FAILURE!".PHP_EOL.
+                    'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.'.PHP_EOL,
                     count($result->getBackups()),
                     $result->checksFailedCount(),
                     $result->cryptsFailedCount(),
@@ -585,7 +585,7 @@ 
         if ($this->colors) {
             $buffer = Util\Cli::formatWithColor($color, $buffer);
         }
-        $this->write($buffer . PHP_EOL);
+        $this->write($buffer.PHP_EOL);
     }
 
     /**

src/Cli/Executable/Tar.php

Spacing +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
 
         $tar->addOptionIfNotEmpty('--ignore-failed-read', $this->ignoreFailedRead, false);
         $tar->addOptionIfNotEmpty('--use-compress-program', $this->compressProgram);
-        $tar->addOption('-' . (empty($this->compressProgram) ? $this->compression : '') . 'cf');
+        $tar->addOption('-'.(empty($this->compressProgram) ? $this->compression : '').'cf');
         $tar->addArgument($this->tarPathname);
         $tar->addOption('-C', dirname($this->path), ' ');
         $tar->addArgument(basename($this->path));