sebastianfeldmann / phpbu

src/Backup/Collector/Local.php

Spacing +3 added lines, -3 removed lines

@@ -110,8 +110,8 @@ 
             if ($file->getPathname() == $this->target->getPathname()) {
                 continue;
             }
-            if (preg_match('#' . $this->fileRegex . '#i', $file->getFilename())) {
-                $index               = date('YmdHis', $file->getMTime()) . '-' . $i . '-' . $file->getPathname();
+            if (preg_match('#'.$this->fileRegex.'#i', $file->getFilename())) {
+                $index               = date('YmdHis', $file->getMTime()).'-'.$i.'-'.$file->getPathname();
                 $this->files[$index] = new FileLocal($file->getFileInfo());
             }
         }
@@ -140,6 +140,6 @@ 
     {
         $dirTarget = Arr::getValue($this->target->getChangingPathElements(), $depth);
         $dirRegex  = Str::datePlaceholdersToRegex($dirTarget);
-        return preg_match('#' . $dirRegex . '#i', $dir);
+        return preg_match('#'.$dirRegex.'#i', $dir);
     }
 }

src/Backup/Collector/OpenStack.php

Spacing +2 added lines, -2 removed lines

@@ -52,10 +52,10 @@
                 continue;
             }
             // skip currently created backup
-            if ($object->name == $this->path . $this->target->getFilename()) {
+            if ($object->name == $this->path.$this->target->getFilename()) {
                 continue;
             }
-            if (preg_match('#' . $this->fileRegex . '#i', basename($object->name))) {
+            if (preg_match('#'.$this->fileRegex.'#i', basename($object->name))) {
                 $this->files[] = new \phpbu\App\Backup\File\OpenStack($this->container, $object);
             }
         }

src/Backup/Sync/SoftLayer.php

Spacing +12 added lines, -12 removed lines

@@ -74,7 +74,7 @@ 
         // check for mandatory options
         foreach (['user', 'secret', 'container', 'host', 'path'] as $option) {
             if (!Arr::isSetAndNotEmptyString($config, $option)) {
-                throw new Exception('SoftLayer ' . $option . ' is mandatory');
+                throw new Exception('SoftLayer '.$option.' is mandatory');
             }
         }
 
@@ -98,19 +98,19 @@ 
     public function sync(Target $target, Result $result)
     {
         $sourcePath = $target->getPathname();
-        $targetPath = $this->path . $target->getFilename();
+        $targetPath = $this->path.$target->getFilename();
 
         $options       = ['adapter' => ObjectStorage_Http_Client::SOCKET, 'timeout' => 20];
         $objectStorage = new ObjectStorage($this->host, $this->user, $this->secret, $options);
 
-        $result->debug('softlayer source: ' . $sourcePath);
-        $result->debug('softlayer target: ' . $targetPath);
+        $result->debug('softlayer source: '.$sourcePath);
+        $result->debug('softlayer target: '.$targetPath);
 
         try {
             /** @var \ObjectStorage_Container $container */
-            $container = $objectStorage->with($this->container . $targetPath)
+            $container = $objectStorage->with($this->container.$targetPath)
                                        ->setLocalFile($sourcePath)
-                                       ->setMeta('description', 'PHPBU Backup: ' . date('r', time()))
+                                       ->setMeta('description', 'PHPBU Backup: '.date('r', time()))
                                        ->setHeader('Content-Type', $target->getMimeType());
             $container->create();
         } catch (\Exception $e) {
@@ -129,12 +129,12 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup to SoftLayer' . PHP_EOL
-            . '  host:      ' . $this->host . PHP_EOL
-            . '  user:      ' . $this->user . PHP_EOL
-            . '  secret:     ********' . PHP_EOL
-            . '  container: ' . $this->container . PHP_EOL
-            . '  location:  ' . $this->path
+            'sync backup to SoftLayer'.PHP_EOL
+            . '  host:      '.$this->host.PHP_EOL
+            . '  user:      '.$this->user.PHP_EOL
+            . '  secret:     ********'.PHP_EOL
+            . '  container: '.$this->container.PHP_EOL
+            . '  location:  '.$this->path
         );
     }
 

src/Backup/File/OpenStack.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $this->container = $container;
         $this->filename = basename($object->name);
         $this->pathname = $object->name;
-        $this->size = (int)$object->contentLength;
+        $this->size = (int) $object->contentLength;
         $this->lastModified = $object->lastModified->getTimestamp();
     }
 

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/Collector/Sftp.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
             if ($fileInfo['filename'] == $this->target->getFilename()) {
                 continue;
             }
-            if (preg_match('#' . $this->fileRegex . '#i', $fileInfo['filename'])) {
+            if (preg_match('#'.$this->fileRegex.'#i', $fileInfo['filename'])) {
                 $this->files[] = new \phpbu\App\Backup\File\Sftp($this->sftp, $fileInfo, $this->path);
             }
         }

src/Backup/File/Sftp.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     {
         $this->sftp         = $sftp;
         $this->filename     = $fileInfo['filename'];
-        $this->pathname     = $remotePath . '/' . $fileInfo['filename'];
+        $this->pathname     = $remotePath.'/'.$fileInfo['filename'];
         $this->size         = $fileInfo['size'];
         $this->lastModified = $fileInfo['mtime'];
     }

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>';
     }
 }