Inspection of "Fix method call" - sebastianfeldmann/phpbu - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( afb84c...f5ece7 )

by Sebastian

created 2017-02-03 21:41 UTC

Status

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -116,9 +116,9 @@
 block discarded – undo
         try {
             /** @var \ObjectStorage_Container $container */
             $container = $objectStorage->with($this->container . $targetPath)
-                                       ->setLocalFile($sourcePath)
-                                       ->setMeta('description', 'PHPBU Backup: ' . date('r', time()))
-                                       ->setHeader('Content-Type', $target->getMimeType());
+                                        ->setLocalFile($sourcePath)
+                                        ->setMeta('description', 'PHPBU Backup: ' . date('r', time()))
+                                        ->setHeader('Content-Type', $target->getMimeType());
             $container->create();
         } catch (\Exception $e) {
             throw new Exception($e->getMessage(), null, $e);

Please login to merge, or discard this patch.

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -73,7 +73,7 @@  discard block
 block discarded – undo
         // 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');
             }
         }
 
@@ -97,19 +97,19 @@  discard block
 block discarded – undo
     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) {
@@ -128,12 +128,12 @@  discard block
 block discarded – undo
     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
         );
     }
 }

Please login to merge, or discard this patch.

src/Log/Mail.php 2 patches

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

@@ -177,12 +177,12 @@  discard block
 block discarded – undo
             $info    = $this->getInfoHtml($result);
             $footer  = $this->getFooterHtml();
             $body    = '<html><body '. TPL::getSnippet('sBody') . '>'
-                     . $header
-                     . $status
-                     . $errors
-                     . $info
-                     . $footer
-                     . '</body></html>';
+                        . $header
+                        . $status
+                        . $errors
+                        . $info
+                        . $footer
+                        . '</body></html>';
             $sent    = null;
 
             try {
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
 
         if ($username && $password) {
             $transport->setUsername($username)
-                      ->setPassword($password);
+                        ->setPassword($password);
         }
         if ($encryption) {
             $transport->setEncryption($encryption);
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
     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>';
+                    '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
     }
 
     /**
@@ -388,11 +388,11 @@  discard block
 block discarded – undo
             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>' .
+                    '<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;
@@ -453,65 +453,65 @@  discard block
 block discarded – undo
                     $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>' .
-                         '</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">' .
+                            '<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">' .
+                            '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
                             $backup->checkCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
+                            '</td>' .
+                            '</tr>' .
+                            '<tr>' .
+                            '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
+                            '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
                             $backup->cryptCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
+                            '</td>' .
+                            '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
                             $backup->cryptCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
+                            '</td>' .
+                            '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
                             $backup->cryptCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
+                            '</td>' .
+                            '</tr>' .
+                            '<tr>' .
+                            '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
+                            '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
                             $backup->syncCount() . '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
+                            '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
                             $backup->syncCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
+                            '</td>' .
+                            '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
                             $backup->syncCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
+                            '</td>' .
+                            '</tr>' .
+                            '<tr>' .
+                            '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
+                            '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
                             $backup->cleanupCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
+                            '</td>' .
+                            '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
                             $backup->cleanupCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
+                            '</td>' .
+                            '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
                             $backup->cleanupCountFailed() .
-                          '</td>' .
-                         '</tr>';
+                            '</td>' .
+                            '</tr>';
 
             }
             $html .= '</table>';
@@ -527,6 +527,6 @@  discard block
 block discarded – undo
     protected function getFooterHtml()
     {
         return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
-               '</td></tr></table>';
+                '</td></tr></table>';
     }
 }

Please login to merge, or discard this patch.

Spacing +74 added lines, -74 removed lines patch added patch discarded remove patch

@@ -148,8 +148,8 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
             $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 */
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
             throw new Exception('option \'sendmail.path\' ist missing');
         }
         $path    = $options['sendmail.path'];
-        $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
+        $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
 
         /* @var $transport \Swift_SendmailTransport */
-        $transport = \Swift_SendmailTransport::newInstance($path . $options);
+        $transport = \Swift_SendmailTransport::newInstance($path.$options);
 
         return $transport;
     }
@@ -349,8 +349,8 @@  discard block
 block discarded – undo
      */
     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>';
     }
 
     /**
@@ -387,12 +387,12 @@  discard block
 block discarded – undo
             $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;
@@ -409,17 +409,17 @@  discard block
 block discarded – undo
         $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>';
 
             }
@@ -439,78 +439,78 @@  discard block
 block discarded – undo
         $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>';
 
             }
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
      */
     protected function getFooterHtml()
     {
-        return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
+        return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'.
                '</td></tr></table>';
     }
 }

Please login to merge, or discard this patch.

src/Backup/Sync/AmazonS3v2.php 2 patches

Unused Use Statements -2 removed lines patch added patch discarded remove patch

@@ -5,8 +5,6 @@
 block discarded – undo
 use phpbu\App\Result;
 use phpbu\App\Backup\Sync;
 use phpbu\App\Backup\Target;
-use phpbu\App\Util\Arr;
-use phpbu\App\Util\Str;
 
 /**
  * Amazon S3 Sync

Please login to merge, or discard this patch.

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@
 block discarded – undo
     public function sync(Target $target, Result $result)
     {
         $sourcePath = $target->getPathname();
-        $targetPath = $this->path . $target->getFilename();
+        $targetPath = $this->path.$target->getFilename();
 
         $s3 = S3Client::factory(
             [

Please login to merge, or discard this patch.

src/Util/Str.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -185,7 +185,7 @@  discard block
 block discarded – undo
      */
     public static function withTrailingSlash($string)
     {
-        return $string . (substr($string, -1) !== '/' ? '/' : '');
+        return $string.(substr($string, -1) !== '/' ? '/' : '');
     }
 
     /**
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
      */
     public static function withLeadingSlash($string)
     {
-        return (substr($string, 0, 1) !== '/' ? '/' : '') . $string;
+        return (substr($string, 0, 1) !== '/' ? '/' : '').$string;
     }
 
     /**
@@ -230,6 +230,6 @@  discard block
 block discarded – undo
      */
     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'));
     }
 }

Please login to merge, or discard this patch.

src/Backup/Sync/Xtp.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -101,11 +101,11 @@
 block discarded – undo
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup to ' . $this->getProtocolName() . ' server' . PHP_EOL
-            . '  host:     ' . $this->host . PHP_EOL
-            . '  user:     ' . $this->user . PHP_EOL
-            . '  password:  ********' . PHP_EOL
-            . '  path:     ' . $this->remotePath
+            'sync backup to '.$this->getProtocolName().' server'.PHP_EOL
+            . '  host:     '.$this->host.PHP_EOL
+            . '  user:     '.$this->user.PHP_EOL
+            . '  password:  ********'.PHP_EOL
+            . '  path:     '.$this->remotePath
         );
     }
 }

Please login to merge, or discard this patch.

src/Backup/Sync/Dropbox.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -76,7 +76,7 @@  discard block
 block discarded – undo
     public function sync(Target $target, Result $result)
     {
         $sourcePath  = $target->getPathname();
-        $dropboxPath = $this->path . $target->getFilename();
+        $dropboxPath = $this->path.$target->getFilename();
         $client      = new DropboxApi\Client($this->token, "phpbu/1.1.0");
         $pathError   = DropboxApi\Path::findErrorNonRoot($dropboxPath);
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
         } catch (\Exception $e) {
             throw new Exception($e->getMessage(), null, $e);
         }
-        $result->debug('upload: done  (' . $res['size'] . ')');
+        $result->debug('upload: done  ('.$res['size'].')');
     }
 
     /**
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup to dropbox' . PHP_EOL
-            . '  token:    ********' . PHP_EOL
-            . '  location: ' . $this->path
+            'sync backup to dropbox'.PHP_EOL
+            . '  token:    ********'.PHP_EOL
+            . '  location: '.$this->path
         );
     }
 }

Please login to merge, or discard this patch.

src/Cli/Executable/Elasticdump.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -180,13 +180,13 @@  discard block
 block discarded – undo
 
         // make sure there is a scheme
         if (!isset($parsed['scheme'])) {
-            $parsed = parse_url('http://' . $host);
+            $parsed = parse_url('http://'.$host);
         }
 
-        $url = $parsed['scheme'] . '://' . $this->getAuthUrlSnippet($user, $password) . $parsed['host'];
+        $url = $parsed['scheme'].'://'.$this->getAuthUrlSnippet($user, $password).$parsed['host'];
 
         if (isset($parsed['port'])) {
-            $url .= ':' . $parsed['port'];
+            $url .= ':'.$parsed['port'];
         }
 
         if (!empty($parsed['path'])) {
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
         $url = $user;
 
         if (!empty($password)) {
-            $url .= ':' . $password;
+            $url .= ':'.$password;
         }
 
         if (!empty($url)) {

Please login to merge, or discard this patch.

src/Runner/Bootstrap.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -54,7 +54,7 @@  discard block
 block discarded – undo
         $path = $configuration->getIncludePaths();
         if (count($path)) {
             $path = implode(PATH_SEPARATOR, $path);
-            ini_set('include_path', $path . PATH_SEPARATOR . ini_get('include_path'));
+            ini_set('include_path', $path.PATH_SEPARATOR.ini_get('include_path'));
         }
     }
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
         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;
         }

Please login to merge, or discard this patch.

src/Configuration/Loader/Factory.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -42,7 +42,7 @@
 block discarded – undo
     {
         $ext   = pathinfo($filename, PATHINFO_EXTENSION);
         $type  = isset(self::$extToLoaderMap[$ext]) ? self::$extToLoaderMap[$ext] : self::DEFAULT_LOADER;
-        $class = '\\phpbu\\App\\Configuration\\Loader\\' . $type;
+        $class = '\\phpbu\\App\\Configuration\\Loader\\'.$type;
 
         return new $class($filename);
     }

Please login to merge, or discard this patch.

		@@ -177,12 +177,12 @@ discard block
		block discarded – undo
177	177	$info = $this->getInfoHtml($result);
178	178	$footer = $this->getFooterHtml();
179	179	$body = '<html><body '. TPL::getSnippet('sBody') . '>'
180		- . $header
181		- . $status
182		- . $errors
183		- . $info
184		- . $footer
185		- . '</body></html>';
	180	+ . $header
	181	+ . $status
	182	+ . $errors
	183	+ . $info
	184	+ . $footer
	185	+ . '</body></html>';
186	186	$sent = null;
187	187
188	188	try {
		@@ -313,7 +313,7 @@ discard block
		block discarded – undo
313	313
314	314	if ($username && $password) {
315	315	$transport->setUsername($username)
316		- ->setPassword($password);
	316	+ ->setPassword($password);
317	317	}
318	318	if ($encryption) {
319	319	$transport->setEncryption($encryption);
		@@ -350,7 +350,7 @@ discard block
		block discarded – undo
350	350	protected function getHeaderHtml()
351	351	{
352	352	return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
353		- '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
	353	+ '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
354	354	}
355	355
356	356	/**
		@@ -388,11 +388,11 @@ discard block
		block discarded – undo
388	388	Str::appendPluralS('cleanup', $this->numCleanups)
389	389	);
390	390	$html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
391		- '<tr><td>' .
392		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
393		- '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
394		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
395		- '</td></tr>' .
	391	+ '<tr><td>' .
	392	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
	393	+ '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
	394	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
	395	+ '</td></tr>' .
396	396	'</table>';
397	397
398	398	return $html;
		@@ -453,65 +453,65 @@ discard block
		block discarded – undo
453	453	$status = 'FAILURE';
454	454	}
455	455	$html .= '<tr>' .
456		- '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
457		- sprintf('backup <em>%s</em>', $backup->getName()) .
458		- ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
459		- '</td>' .
460		- '</tr>' .
461		- '<tr>' .
462		- '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
463		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
464		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
465		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
466		- '</tr>';
	456	+ '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
	457	+ sprintf('backup <em>%s</em>', $backup->getName()) .
	458	+ ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
	459	+ '</td>' .
	460	+ '</tr>' .
	461	+ '<tr>' .
	462	+ '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
	463	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
	464	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
	465	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
	466	+ '</tr>';
467	467
468	468	$html .= '<tr>' .
469		- '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
470		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	469	+ '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
	470	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
471	471	$backup->checkCount() . '
472	472	</td>' .
473		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
	473	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
474	474
475	475	</td>' .
476		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	476	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
477	477	$backup->checkCountFailed() .
478		- '</td>' .
479		- '</tr>' .
480		- '<tr>' .
481		- '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
482		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	478	+ '</td>' .
	479	+ '</tr>' .
	480	+ '<tr>' .
	481	+ '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
	482	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
483	483	$backup->cryptCount() .
484		- '</td>' .
485		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	484	+ '</td>' .
	485	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
486	486	$backup->cryptCountSkipped() .
487		- '</td>' .
488		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	487	+ '</td>' .
	488	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
489	489	$backup->cryptCountFailed() .
490		- '</td>' .
491		- '</tr>' .
492		- '<tr>' .
493		- '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
494		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	490	+ '</td>' .
	491	+ '</tr>' .
	492	+ '<tr>' .
	493	+ '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
	494	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
495	495	$backup->syncCount() . '</td>' .
496		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	496	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
497	497	$backup->syncCountSkipped() .
498		- '</td>' .
499		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	498	+ '</td>' .
	499	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
500	500	$backup->syncCountFailed() .
501		- '</td>' .
502		- '</tr>' .
503		- '<tr>' .
504		- '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
505		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	501	+ '</td>' .
	502	+ '</tr>' .
	503	+ '<tr>' .
	504	+ '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
	505	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
506	506	$backup->cleanupCount() .
507		- '</td>' .
508		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	507	+ '</td>' .
	508	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
509	509	$backup->cleanupCountSkipped() .
510		- '</td>' .
511		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	510	+ '</td>' .
	511	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
512	512	$backup->cleanupCountFailed() .
513		- '</td>' .
514		- '</tr>';
	513	+ '</td>' .
	514	+ '</tr>';
515	515
516	516	}
517	517	$html .= '</table>';
		@@ -527,6 +527,6 @@ discard block
		block discarded – undo
527	527	protected function getFooterHtml()
528	528	{
529	529	return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
530		- '</td></tr></table>';
	530	+ '</td></tr></table>';
531	531	}
532	532	}

		@@ -185,7 +185,7 @@ discard block
		block discarded – undo
185	185	*/
186	186	public static function withTrailingSlash($string)
187	187	{
188		- return $string . (substr($string, -1) !== '/' ? '/' : '');
	188	+ return $string.(substr($string, -1) !== '/' ? '/' : '');
189	189	}
190	190
191	191	/**
		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207	*/
208	208	public static function withLeadingSlash($string)
209	209	{
210		- return (substr($string, 0, 1) !== '/' ? '/' : '') . $string;
	210	+ return (substr($string, 0, 1) !== '/' ? '/' : '').$string;
211	211	}
212	212
213	213	/**
		@@ -230,6 +230,6 @@ discard block
		block discarded – undo
230	230	*/
231	231	public static function appendPluralS($subject, $amount)
232	232	{
233		- return $subject . ($amount == 1 ? '' : (substr($subject, -1) == 's' ? '\'s' : 's'));
	233	+ return $subject.($amount == 1 ? '' : (substr($subject, -1) == 's' ? '\'s' : 's'));
234	234	}
235	235	}

		@@ -101,11 +101,11 @@
		block discarded – undo
101	101	public function simulate(Target $target, Result $result)
102	102	{
103	103	$result->debug(
104		- 'sync backup to ' . $this->getProtocolName() . ' server' . PHP_EOL
105		- . ' host: ' . $this->host . PHP_EOL
106		- . ' user: ' . $this->user . PHP_EOL
107		- . ' password: ********' . PHP_EOL
108		- . ' path: ' . $this->remotePath
	104	+ 'sync backup to '.$this->getProtocolName().' server'.PHP_EOL
	105	+ . ' host: '.$this->host.PHP_EOL
	106	+ . ' user: '.$this->user.PHP_EOL
	107	+ . ' password: ********'.PHP_EOL
	108	+ . ' path: '.$this->remotePath
109	109	);
110	110	}
111	111	}

		@@ -180,13 +180,13 @@ discard block
		block discarded – undo
180	180
181	181	// make sure there is a scheme
182	182	if (!isset($parsed['scheme'])) {
183		- $parsed = parse_url('http://' . $host);
	183	+ $parsed = parse_url('http://'.$host);
184	184	}
185	185
186		- $url = $parsed['scheme'] . '://' . $this->getAuthUrlSnippet($user, $password) . $parsed['host'];
	186	+ $url = $parsed['scheme'].'://'.$this->getAuthUrlSnippet($user, $password).$parsed['host'];
187	187
188	188	if (isset($parsed['port'])) {
189		- $url .= ':' . $parsed['port'];
	189	+ $url .= ':'.$parsed['port'];
190	190	}
191	191
192	192	if (!empty($parsed['path'])) {
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	$url = $user;
215	215
216	216	if (!empty($password)) {
217		- $url .= ':' . $password;
	217	+ $url .= ':'.$password;
218	218	}
219	219
220	220	if (!empty($url)) {

		@@ -116,9 +116,9 @@
		block discarded – undo
116	116	try {
117	117	/** @var \ObjectStorage_Container $container */
118	118	$container = $objectStorage->with($this->container . $targetPath)
119		- ->setLocalFile($sourcePath)
120		- ->setMeta('description', 'PHPBU Backup: ' . date('r', time()))
121		- ->setHeader('Content-Type', $target->getMimeType());
	119	+ ->setLocalFile($sourcePath)
	120	+ ->setMeta('description', 'PHPBU Backup: ' . date('r', time()))
	121	+ ->setHeader('Content-Type', $target->getMimeType());
122	122	$container->create();
123	123	} catch (\Exception $e) {
124	124	throw new Exception($e->getMessage(), null, $e);

		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	// check for mandatory options
74	74	foreach (['user', 'secret', 'container', 'host', 'path'] as $option) {
75	75	if (!Arr::isSetAndNotEmptyString($config, $option)) {
76		- throw new Exception('SoftLayer ' . $option . ' is mandatory');
	76	+ throw new Exception('SoftLayer '.$option.' is mandatory');
77	77	}
78	78	}
79	79
		@@ -97,19 +97,19 @@ discard block
		block discarded – undo
97	97	public function sync(Target $target, Result $result)
98	98	{
99	99	$sourcePath = $target->getPathname();
100		- $targetPath = $this->path . $target->getFilename();
	100	+ $targetPath = $this->path.$target->getFilename();
101	101
102	102	$options = ['adapter' => ObjectStorage_Http_Client::SOCKET, 'timeout' => 20];
103	103	$objectStorage = new ObjectStorage($this->host, $this->user, $this->secret, $options);
104	104
105		- $result->debug('softlayer source: ' . $sourcePath);
106		- $result->debug('softlayer target: ' . $targetPath);
	105	+ $result->debug('softlayer source: '.$sourcePath);
	106	+ $result->debug('softlayer target: '.$targetPath);
107	107
108	108	try {
109	109	/** @var \ObjectStorage_Container $container */
110		- $container = $objectStorage->with($this->container . $targetPath)
	110	+ $container = $objectStorage->with($this->container.$targetPath)
111	111	->setLocalFile($sourcePath)
112		- ->setMeta('description', 'PHPBU Backup: ' . date('r', time()))
	112	+ ->setMeta('description', 'PHPBU Backup: '.date('r', time()))
113	113	->setHeader('Content-Type', $target->getMimeType());
114	114	$container->create();
115	115	} catch (\Exception $e) {
		@@ -128,12 +128,12 @@ discard block
		block discarded – undo
128	128	public function simulate(Target $target, Result $result)
129	129	{
130	130	$result->debug(
131		- 'sync backup to SoftLayer' . PHP_EOL
132		- . ' host: ' . $this->host . PHP_EOL
133		- . ' user: ' . $this->user . PHP_EOL
134		- . ' secret: ********' . PHP_EOL
135		- . ' container: ' . $this->container . PHP_EOL
136		- . ' location: ' . $this->path
	131	+ 'sync backup to SoftLayer'.PHP_EOL
	132	+ . ' host: '.$this->host.PHP_EOL
	133	+ . ' user: '.$this->user.PHP_EOL
	134	+ . ' secret: ********'.PHP_EOL
	135	+ . ' container: '.$this->container.PHP_EOL
	136	+ . ' location: '.$this->path
137	137	);
138	138	}
139	139	}

		@@ -148,8 +148,8 @@ discard block
		block discarded – undo
148	148	$mails = $options['recipients'];
149	149	$server = gethostname();
150	150	$this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false);
151		- $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server);
152		- $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server);
	151	+ $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server);
	152	+ $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server);
153	153	$this->senderName = Arr::getValue($options, 'sender.name');
154	154	$this->transportType = Arr::getValue($options, 'transport', 'mail');
155	155	$this->recipients = array_map('trim', explode(';', $mails));
		@@ -176,14 +176,14 @@ discard block
		block discarded – undo
176	176	$errors = $this->getErrorHtml($result);
177	177	$info = $this->getInfoHtml($result);
178	178	$footer = $this->getFooterHtml();
179		- $body = '<html><body '. TPL::getSnippet('sBody') . '>'
	179	+ $body = '<html><body '.TPL::getSnippet('sBody').'>'
180	180	. $header
181	181	. $status
182	182	. $errors
183	183	. $info
184	184	. $footer
185	185	. '</body></html>';
186		- $sent = null;
	186	+ $sent = null;
187	187
188	188	try {
189	189	/** @var \Swift_Message $message */
		@@ -334,10 +334,10 @@ discard block
		block discarded – undo
334	334	throw new Exception('option \'sendmail.path\' ist missing');
335	335	}
336	336	$path = $options['sendmail.path'];
337		- $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
	337	+ $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
338	338
339	339	/* @var $transport \Swift_SendmailTransport */
340		- $transport = \Swift_SendmailTransport::newInstance($path . $options);
	340	+ $transport = \Swift_SendmailTransport::newInstance($path.$options);
341	341
342	342	return $transport;
343	343	}
		@@ -349,8 +349,8 @@ discard block
		block discarded – undo
349	349	*/
350	350	protected function getHeaderHtml()
351	351	{
352		- return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
353		- '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
	352	+ return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'.
	353	+ '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>';
354	354	}
355	355
356	356	/**
		@@ -387,12 +387,12 @@ discard block
		block discarded – undo
387	387	$this->numCleanups,
388	388	Str::appendPluralS('cleanup', $this->numCleanups)
389	389	);
390		- $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
391		- '<tr><td>' .
392		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
393		- '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
394		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
395		- '</td></tr>' .
	390	+ $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'.
	391	+ '<tr><td>'.
	392	+ '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'.
	393	+ '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'.
	394	+ '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'.
	395	+ '</td></tr>'.
396	396	'</table>';
397	397
398	398	return $html;
		@@ -409,17 +409,17 @@ discard block
		block discarded – undo
409	409	$html = '';
410	410	$errors = $result->getErrors();
411	411	if (count($errors)) {
412		- $html .= '<table ' . TPL::getSnippet('sTableError') . '>';
	412	+ $html .= '<table '.TPL::getSnippet('sTableError').'>';
413	413	/* @var $e Exception */
414	414	foreach ($errors as $e) {
415		- $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' .
	415	+ $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'.
416	416	sprintf(
417	417	"Exception '%s' with message '%s' in %s:%d",
418	418	get_class($e),
419	419	$e->getMessage(),
420	420	$e->getFile(),
421	421	$e->getLine()
422		- ) .
	422	+ ).
423	423	'</td></tr>';
424	424
425	425	}
		@@ -439,78 +439,78 @@ discard block
		block discarded – undo
439	439	$html = '';
440	440	$backups = $result->getBackups();
441	441	if (count($backups)) {
442		- $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>';
	442	+ $html .= '<table '.TPL::getSnippet('sTableBackup').'>';
443	443	/** @var \phpbu\App\Result\Backup $backup */
444	444	foreach ($backups as $backup) {
445	445	if ($backup->allOk()) {
446	446	$color = TPL::getSnippet('cStatusOK');
447	447	$status = 'OK';
448		- } elseif($backup->okButSkipsOrFails()) {
	448	+ } elseif ($backup->okButSkipsOrFails()) {
449	449	$color = TPL::getSnippet('cStatusWARN');
450	450	$status = 'WARNING';
451	451	} else {
452	452	$color = TPL::getSnippet('cStatusFAIL');
453	453	$status = 'FAILURE';
454	454	}
455		- $html .= '<tr>' .
456		- '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
457		- sprintf('backup <em>%s</em>', $backup->getName()) .
458		- ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
459		- '</td>' .
460		- '</tr>' .
461		- '<tr>' .
462		- '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
463		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
464		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
465		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
	455	+ $html .= '<tr>'.
	456	+ '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'.
	457	+ sprintf('backup <em>%s</em>', $backup->getName()).
	458	+ ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'.
	459	+ '</td>'.
	460	+ '</tr>'.
	461	+ '<tr>'.
	462	+ '<td '.TPL::getSnippet('sRowHead').'> </td>'.
	463	+ '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'.
	464	+ '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'.
	465	+ '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'.
466	466	'</tr>';
467	467
468		- $html .= '<tr>' .
469		- '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
470		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
471		- $backup->checkCount() . '
	468	+ $html .= '<tr>'.
	469	+ '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'.
	470	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
	471	+ $backup->checkCount().'
472	472	</td>' .
473		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
	473	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">
474	474
475	475	</td>' .
476		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
477		- $backup->checkCountFailed() .
478		- '</td>' .
479		- '</tr>' .
480		- '<tr>' .
481		- '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
482		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
483		- $backup->cryptCount() .
484		- '</td>' .
485		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
486		- $backup->cryptCountSkipped() .
487		- '</td>' .
488		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
489		- $backup->cryptCountFailed() .
490		- '</td>' .
491		- '</tr>' .
492		- '<tr>' .
493		- '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
494		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
495		- $backup->syncCount() . '</td>' .
496		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
497		- $backup->syncCountSkipped() .
498		- '</td>' .
499		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
500		- $backup->syncCountFailed() .
501		- '</td>' .
502		- '</tr>' .
503		- '<tr>' .
504		- '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
505		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
506		- $backup->cleanupCount() .
507		- '</td>' .
508		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
509		- $backup->cleanupCountSkipped() .
510		- '</td>' .
511		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
512		- $backup->cleanupCountFailed() .
513		- '</td>' .
	476	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
	477	+ $backup->checkCountFailed().
	478	+ '</td>'.
	479	+ '</tr>'.
	480	+ '<tr>'.
	481	+ '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'.
	482	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	483	+ $backup->cryptCount().
	484	+ '</td>'.
	485	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	486	+ $backup->cryptCountSkipped().
	487	+ '</td>'.
	488	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	489	+ $backup->cryptCountFailed().
	490	+ '</td>'.
	491	+ '</tr>'.
	492	+ '<tr>'.
	493	+ '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'.
	494	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	495	+ $backup->syncCount().'</td>'.
	496	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	497	+ $backup->syncCountSkipped().
	498	+ '</td>'.
	499	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	500	+ $backup->syncCountFailed().
	501	+ '</td>'.
	502	+ '</tr>'.
	503	+ '<tr>'.
	504	+ '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'.
	505	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	506	+ $backup->cleanupCount().
	507	+ '</td>'.
	508	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	509	+ $backup->cleanupCountSkipped().
	510	+ '</td>'.
	511	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	512	+ $backup->cleanupCountFailed().
	513	+ '</td>'.
514	514	'</tr>';
515	515
516	516	}
		@@ -526,7 +526,7 @@ discard block
		block discarded – undo
526	526	*/
527	527	protected function getFooterHtml()
528	528	{
529		- return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
	529	+ return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'.
530	530	'</td></tr></table>';
531	531	}
532	532	}

		@@ -5,8 +5,6 @@
		block discarded – undo
5	5	use phpbu\App\Result;
6	6	use phpbu\App\Backup\Sync;
7	7	use phpbu\App\Backup\Target;
8		-use phpbu\App\Util\Arr;
9		-use phpbu\App\Util\Str;
10	8
11	9	/**
12	10	* Amazon S3 Sync

		@@ -32,7 +32,7 @@
		block discarded – undo
32	32	public function sync(Target $target, Result $result)
33	33	{
34	34	$sourcePath = $target->getPathname();
35		- $targetPath = $this->path . $target->getFilename();
	35	+ $targetPath = $this->path.$target->getFilename();
36	36
37	37	$s3 = S3Client::factory(
38	38	[

		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	public function sync(Target $target, Result $result)
77	77	{
78	78	$sourcePath = $target->getPathname();
79		- $dropboxPath = $this->path . $target->getFilename();
	79	+ $dropboxPath = $this->path.$target->getFilename();
80	80	$client = new DropboxApi\Client($this->token, "phpbu/1.1.0");
81	81	$pathError = DropboxApi\Path::findErrorNonRoot($dropboxPath);
82	82
		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	} catch (\Exception $e) {
101	101	throw new Exception($e->getMessage(), null, $e);
102	102	}
103		- $result->debug('upload: done (' . $res['size'] . ')');
	103	+ $result->debug('upload: done ('.$res['size'].')');
104	104	}
105	105
106	106	/**
		@@ -112,9 +112,9 @@ discard block
		block discarded – undo
112	112	public function simulate(Target $target, Result $result)
113	113	{
114	114	$result->debug(
115		- 'sync backup to dropbox' . PHP_EOL
116		- . ' token: ********' . PHP_EOL
117		- . ' location: ' . $this->path
	115	+ 'sync backup to dropbox'.PHP_EOL
	116	+ . ' token: ********'.PHP_EOL
	117	+ . ' location: '.$this->path
118	118	);
119	119	}
120	120	}

		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	$path = $configuration->getIncludePaths();
55	55	if (count($path)) {
56	56	$path = implode(PATH_SEPARATOR, $path);
57		- ini_set('include_path', $path . PATH_SEPARATOR . ini_get('include_path'));
	57	+ ini_set('include_path', $path.PATH_SEPARATOR.ini_get('include_path'));
58	58	}
59	59	}
60	60
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	if (!empty($filename)) {
72	72	$pathToFile = stream_resolve_include_path($filename);
73	73	if (!$pathToFile \|\| !is_readable($pathToFile)) {
74		- throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename));
	74	+ throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename));
75	75	}
76	76	require $pathToFile;
77	77	}

		@@ -42,7 +42,7 @@
		block discarded – undo
42	42	{
43	43	$ext = pathinfo($filename, PATHINFO_EXTENSION);
44	44	$type = isset(self::$extToLoaderMap[$ext]) ? self::$extToLoaderMap[$ext] : self::DEFAULT_LOADER;
45		- $class = '\\phpbu\\App\\Configuration\\Loader\\' . $type;
	45	+ $class = '\\phpbu\\App\\Configuration\\Loader\\'.$type;
46	46
47	47	return new $class($filename);
48	48	}

sebastianfeldmann / phpbu

Push — master ( afb84c...f5ece7 )

Status

Category

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Indentation +57 added lines, -57 removed lines patch added patch discarded remove patch

Spacing +74 added lines, -74 removed lines patch added patch discarded remove patch

Unused Use Statements -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch