sebastianfeldmann / phpbu

src/Runner/Backup.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
             }
             // make sure the backup should be executed and is not excluded via the --limit option
             if (!$configuration->isBackupActive($backup->getName())) {
-                $this->result->debug('skipping backup: ' . $backup->getName() . PHP_EOL);
+                $this->result->debug('skipping backup: '.$backup->getName().PHP_EOL);
                 continue;
             }
             // setup target and collector, reset failure state
@@ -99,7 +99,7 @@ 
                 $this->executeCleanup($backup, $target, $collector);
 
             } catch (\Exception $e) {
-                $this->result->debug('exception: ' . $e->getMessage());
+                $this->result->debug('exception: '.$e->getMessage());
                 $this->result->addError($e);
                 $this->result->backupFailed($backup);
                 if ($backup->stopOnFailure()) {

src/Runner/Simulate.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         foreach ($configuration->getBackups() as $backup) {
             // make sure the backup should be executed and is not excluded via the --limit option
             if (!$configuration->isBackupActive($backup->getName())) {
-                $this->result->debug('skipping backup: ' . $backup->getName() . PHP_EOL);
+                $this->result->debug('skipping backup: '.$backup->getName().PHP_EOL);
                 continue;
             }
             // setup target and collector

src/Backup/Compressor/Abstraction.php

Spacing +2 added lines, -2 removed lines

@@ -64,14 +64,14 @@
     public function compress(Target $target, Result $result) : string
     {
         if (!$this->isPathValid($this->path)) {
-            throw new Exception('path to compress should be valid: ' . $this->path);
+            throw new Exception('path to compress should be valid: '.$this->path);
         }
 
         $res = $this->execute($target);
         $result->debug($res->getCmd());
 
         if (!$res->isSuccessful()) {
-            throw new Exception('Failed to \'compress\' file: ' . $this->path);
+            throw new Exception('Failed to \'compress\' file: '.$this->path);
         }
 
         return $this->getArchiveFile($target);

src/Cmd.php

Spacing +16 added lines, -16 removed lines

@@ -98,7 +98,7 @@ 
                 $ret = self::EXIT_EXCEPTION;
             }
         } catch (\Exception $e) {
-            echo $e->getMessage() . PHP_EOL;
+            echo $e->getMessage().PHP_EOL;
             $ret = self::EXIT_EXCEPTION;
         }
 
@@ -219,7 +219,7 @@ 
         foreach ($settingsToOverride as $arg) {
             $value = Arr::getValue($this->arguments, $arg);
             if (!empty($value)) {
-                $setter = 'set' . ucfirst($arg);
+                $setter = 'set'.ucfirst($arg);
                 $configuration->{$setter}($value);
             }
         }
@@ -235,21 +235,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);
@@ -265,11 +265,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;
     }
 
     /**
@@ -281,10 +281,10 @@ 
 
         $latestVersion = $this->getLatestVersion();
         if ($this->isPharOutdated($latestVersion)) {
-            print 'You are not using the latest version of phpbu.' . PHP_EOL
-                . 'Use "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
+            print 'You are not using the latest version of phpbu.'.PHP_EOL
+                . 'Use "phpbu --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;
         }
     }
 
@@ -300,7 +300,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;
@@ -326,7 +326,7 @@ 
             return;
         }
 
-        echo Version::getVersionString() . PHP_EOL . PHP_EOL;
+        echo Version::getVersionString().PHP_EOL.PHP_EOL;
         $this->isVersionStringPrinted = true;
     }
 
@@ -351,8 +351,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;
         }
     }
 
@@ -366,7 +366,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/Backup/Sync/Openstack.php

Spacing +7 added lines, -7 removed lines

@@ -116,7 +116,7 @@ 
     {
         foreach (['auth_url', 'region', 'username', 'password', 'container_name'] as $option) {
             if (!Arr::isSetAndNotEmptyString($config, $option)) {
-                throw new Exception($option . ' is mandatory');
+                throw new Exception($option.' is mandatory');
             }
         }
     }
@@ -179,11 +179,11 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup to OpenStack' . PHP_EOL
-            . '  region:   ' . $this->region . PHP_EOL
-            . '  key:      ' . $this->username . PHP_EOL
-            . '  password:    ********' . PHP_EOL
-            . '  container: ' . $this->containerName
+            'sync backup to OpenStack'.PHP_EOL
+            . '  region:   '.$this->region.PHP_EOL
+            . '  key:      '.$this->username.PHP_EOL
+            . '  password:    ********'.PHP_EOL
+            . '  container: '.$this->containerName
         );
     }
 
@@ -209,6 +209,6 @@ 
      */
     public function getUploadPath(Target $target)
     {
-        return $this->path . $target->getFilename();
+        return $this->path.$target->getFilename();
     }
 }

src/Backup/Check/SizeDiffPreviousPercent.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      */
     public function simulate(Target $target, $value, Collector $collector, Result $result): bool
     {
-        $result->debug('checking size difference ' . $value . '%' . PHP_EOL);
+        $result->debug('checking size difference '.$value.'%'.PHP_EOL);
         return true;
     }
 }

src/Backup/Check/SizeMin.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      */
     public function simulate(Target $target, $value, Collector $collector, Result $result) : bool
     {
-        $result->debug('checking size to be at least ' . $value . PHP_EOL);
+        $result->debug('checking size to be at least '.$value.PHP_EOL);
         return true;
     }
 }

src/Util/Str.php

Spacing +4 added lines, -4 removed lines

@@ -210,7 +210,7 @@ 
      */
     public static function withTrailingSlash($string)
     {
-        return $string . (self::hasTrailingSlash($string) ? '' : '/');
+        return $string.(self::hasTrailingSlash($string) ? '' : '/');
     }
 
     /**
@@ -232,7 +232,7 @@ 
      */
     public static function hasLeadingSlash(string $string) : bool
     {
-        return substr($string, 0,1) === '/';
+        return substr($string, 0, 1) === '/';
     }
 
     /**
@@ -243,7 +243,7 @@ 
      */
     public static function withLeadingSlash($string)
     {
-        return (self::hasLeadingSlash($string) ? '' : '/') . $string;
+        return (self::hasLeadingSlash($string) ? '' : '/').$string;
     }
 
     /**
@@ -266,6 +266,6 @@ 
      */
     public static function appendPluralS($subject, $amount)
     {
-        return $subject . ($amount == 1 ? '' : (substr($subject, -1) == 's' ? '\'s' : 's'));
+        return $subject.($amount == 1 ? '' : (substr($subject, -1) == 's' ? '\'s' : 's'));
     }
 }

src/Log/Mail.php

Spacing +75 added lines, -75 removed lines

@@ -163,8 +163,8 @@ 
         $server                = gethostname();
         $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false);
         $this->sendSimulating  = Str::toBoolean(Arr::getValue($options, 'sendOnSimulation'), true);
-        $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));
@@ -183,7 +183,7 @@ 
      */
     public function onPhpbuEnd(Event\App\End $event)
     {
-        $result  = $event->getResult();
+        $result = $event->getResult();
 
         if ($this->shouldMailBeSend($result)) {
             $header  = $this->getHeaderHtml();
@@ -191,7 +191,7 @@ 
             $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
@@ -204,7 +204,7 @@ 
             try {
                 /** @var \Swift_Message $message */
                 $message = new Swift_Message();
-                $message->setSubject($this->subject . ' [' . $state . ']')
+                $message->setSubject($this->subject.' ['.$state.']')
                         ->setFrom($this->senderMail, $this->senderName)
                         ->setTo($this->recipients)
                         ->setBody($body, 'text/html');
@@ -358,9 +358,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 new \Swift_SendmailTransport($path . $options);
+            return new \Swift_SendmailTransport($path.$options);
         }
         return new \Swift_SendmailTransport();
     }
@@ -372,8 +372,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>';
     }
 
     /**
@@ -410,12 +410,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;
@@ -432,17 +432,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>';
 
             }
@@ -462,78 +462,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>';
 
             }
@@ -549,7 +549,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>';
     }
 }