sebastianfeldmann / phpbu

build/phar-manifest.php

Spacing +6 added lines, -6 removed lines

@@ -9,16 +9,16 @@ 
 } else {
     $branch = @exec('git rev-parse --abbrev-ref HEAD');
     $hash   = @exec('git log -1 --format="%H"');
-    echo $branch . '@' . $hash;
+    echo $branch.'@'.$hash;
 }
 echo PHP_EOL;
 
-$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock'));
+$lock = json_decode(file_get_contents(__DIR__.'/../composer.lock'));
 
 foreach ($lock->packages as $package) {
-    echo $package->name . ': ' . $package->version;
+    echo $package->name.': '.$package->version;
     if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
-        echo '@' . $package->source->reference;
+        echo '@'.$package->source->reference;
     }
     echo PHP_EOL;
 }
@@ -32,9 +32,9 @@ 
     ])) {
       continue;
     }
-    echo $package->name . ': ' . $package->version;
+    echo $package->name.': '.$package->version;
     if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
-        echo '@' . $package->source->reference;
+        echo '@'.$package->source->reference;
     }
     echo PHP_EOL;
 }

src/Cli/Executable/Rsync.php

Spacing +3 added lines, -3 removed lines

@@ -244,9 +244,9 @@ 
      */
     protected function createCommandLine() : CommandLine
     {
-        $password = !empty($this->password) ? 'RSYNC_PASSWORD=' . escapeshellarg($this->password) . ' ' : '';
+        $password = !empty($this->password) ? 'RSYNC_PASSWORD='.escapeshellarg($this->password).' ' : '';
         $process  = new CommandLine();
-        $cmd      = new Cmd($password . $this->binary);
+        $cmd      = new Cmd($password.$this->binary);
         $process->addCommand($cmd);
 
         if (!empty($this->args)) {
@@ -256,7 +256,7 @@ 
             $this->validateLocations();
 
             // use archive mode, verbose and compress if not already done
-            $options = '-av' . ($this->compressed ? 'z' : '');
+            $options = '-av'.($this->compressed ? 'z' : '');
             $cmd->addOption($options);
             $this->configureExcludes($cmd, $this->excludes);
             $cmd->addOptionIfNotEmpty('--delete', $this->delete, false);

src/Backup/Sync/AmazonS3.php

Spacing +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
     {
         foreach (['key', 'secret', 'bucket', 'region', 'path'] as $option) {
             if (!Arr::isSetAndNotEmptyString($config, $option)) {
-                throw new Exception('AWS S3 ' . $option . ' is mandatory');
+                throw new Exception('AWS S3 '.$option.' is mandatory');
             }
         }
     }
@@ -150,11 +150,11 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup to Amazon S3' . PHP_EOL
-            . '  region:   ' . $this->region . PHP_EOL
-            . '  key:      ' . $this->key . PHP_EOL
-            . '  secret:    ********' . PHP_EOL
-            . '  location: ' . $this->bucket
+            'sync backup to Amazon S3'.PHP_EOL
+            . '  region:   '.$this->region.PHP_EOL
+            . '  key:      '.$this->key.PHP_EOL
+            . '  secret:    ********'.PHP_EOL
+            . '  location: '.$this->bucket
         );
     }
 

src/Log/ResultFormatter/FormData.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $messages = [];
         /** @var \Exception $e */
         foreach ($errors as $e) {
-            $messages[] = $e->getMessage() . ' in file:' . $e->getFile() . ' at line' . $e->getLine();
+            $messages[] = $e->getMessage().' in file:'.$e->getFile().' at line'.$e->getLine();
         }
         return implode(';', $messages);
     }

src/Log/ResultFormatter/Template.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
     private function loadBodyFromTemplate(string $template) : string
     {
         if (!file_exists($template)) {
-            throw new Exception('template not found: ' . $template);
+            throw new Exception('template not found: '.$template);
         }
         return file_get_contents($template);
     }
@@ -115,7 +115,7 @@ 
     {
         $subTemplate = '';
         $match       = [];
-        if (preg_match('#%%' . $loop . '%%([\w\W\s]*)%%' . $loop . '%%#im', $template, $match)) {
+        if (preg_match('#%%'.$loop.'%%([\w\W\s]*)%%'.$loop.'%%#im', $template, $match)) {
             $subTemplate = $match[1];
         }
         return $subTemplate;
@@ -133,7 +133,7 @@ 
         $markup = '';
         /* @var $e \Exception */
         foreach ($errors as $e) {
-            $data   = [
+            $data = [
                 'class'   => get_class($e),
                 'message' => $e->getMessage(),
                 'file'    => $e->getFile(),
@@ -156,7 +156,7 @@ 
         $markup = '';
         /* @var $b \phpbu\App\Result\Backup */
         foreach ($backups as $b) {
-            $data   = [
+            $data = [
                 'name'           => $b->getName(),
                 'status'         => $b->allOk() ? 0 : 1,
                 'checkCount'     => $b->checkCount(),
@@ -186,7 +186,7 @@ 
     private function renderTemplate(string $template, array $data) : string
     {
         foreach ($data as $name => $value) {
-            $template = str_replace('%' . $name . '%', $value, $template);
+            $template = str_replace('%'.$name.'%', $value, $template);
         }
         return $template;
     }
@@ -199,6 +199,6 @@ 
      */
     private function renderLoop(string $loop, string $markup)
     {
-        $this->template = preg_replace('#%%' . $loop . '%%[\w\W\s]*%%' . $loop . '%%#im', $markup, $this->template);
+        $this->template = preg_replace('#%%'.$loop.'%%[\w\W\s]*%%'.$loop.'%%#im', $markup, $this->template);
     }
 }

src/Log/Webhook.php

Spacing +5 added lines, -5 removed lines

@@ -153,7 +153,7 @@ 
     private function buildGetUri(array $data) : string
     {
         $glue = strpos($this->uri, '?') !== false ? '&' : '?';
-        return $this->uri . $glue . http_build_query($data);
+        return $this->uri.$glue.http_build_query($data);
     }
 
     /**
@@ -170,7 +170,7 @@ 
         }
 
         if (!isset($this->availableFormatter[$this->contentType])) {
-            throw new Exception('no default formatter for content-type: ' . $this->contentType);
+            throw new Exception('no default formatter for content-type: '.$this->contentType);
         }
         $class = $this->availableFormatter[$this->contentType];
         return new $class();
@@ -214,12 +214,12 @@ 
         ];
 
         if (!empty($body)) {
-            $headers[]                  = 'Content-Type: ' . $this->contentType;
+            $headers[]                  = 'Content-Type: '.$this->contentType;
             $options['http']['content'] = $body;
         }
 
         if (!empty($this->username)) {
-            $headers[] = 'Authorization: Basic ' . base64_encode($this->username . ':' . $this->password);
+            $headers[] = 'Authorization: Basic '.base64_encode($this->username.':'.$this->password);
         }
 
         $options['http']['header'] = implode("\r\n", $headers);
@@ -228,7 +228,7 @@ 
         try {
             file_get_contents($uri, false, $context);
         } catch (\Throwable $t) {
-            throw new Exception('could not reach webhook: ' . $this->uri);
+            throw new Exception('could not reach webhook: '.$this->uri);
         }
     }
 }

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,7 +176,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
@@ -189,7 +189,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');
@@ -328,9 +328,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();
     }
@@ -342,8 +342,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>';
     }
 
     /**
@@ -380,12 +380,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;
@@ -402,17 +402,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>';
 
             }
@@ -432,78 +432,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>';
 
             }
@@ -519,7 +519,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/Backup/Cleaner/Capacity.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
         if ($this->deleteTarget) {
             $this->deleteTarget = false;
             $result->debug('target will be deleted as well');
-            $result->debug('delete ' . $target->getPathname());
+            $result->debug('delete '.$target->getPathname());
         }
         parent::simulate($target, $collector, $result);
     }
@@ -139,7 +139,7 @@ 
         // should the currently created backup be deleted as well?
         if ($this->deleteTarget) {
             $file          = $target->toFile();
-            $index         = date('YmdHis', $file->getMTime()) . '-' . count($files) . '-' . $file->getPathname();
+            $index         = date('YmdHis', $file->getMTime()).'-'.count($files).'-'.$file->getPathname();
             $files[$index] = $file;
         }
         return $files;

src/Backup/Source/Tar.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
         $result->debug($tar->getCmdPrintable());
 
         if (!$tar->isSuccessful()) {
-            throw new Exception('tar failed: ' . $tar->getStdErr());
+            throw new Exception('tar failed: '.$tar->getStdErr());
         }
 
         return $this->createStatus($target);