Inspection of "More type hints" - sebastianfeldmann/phpbu - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 98071e...5af57d )

by Sebastian

created 2017-02-05 20:18 UTC

Status

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 {
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
 
         if ($username && $password) {
             $transport->setUsername($username)
-                      ->setPassword($password);
+                        ->setPassword($password);
         }
         if ($encryption) {
             $transport->setEncryption($encryption);
@@ -342,7 +342,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>';
     }
 
     /**
@@ -380,11 +380,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;
@@ -445,65 +445,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>';
@@ -519,6 +519,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 */
@@ -327,9 +327,9 @@  discard block
 block discarded – undo
     {
         if (isset($options['sendmail.path'])) {
             $path    = $options['sendmail.path'];
-            $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
+            $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
             /* @var $transport \Swift_SendmailTransport */
-            return \Swift_SendmailTransport::newInstance($path . $options);
+            return \Swift_SendmailTransport::newInstance($path.$options);
         }
         return \Swift_SendmailTransport::newInstance();
     }
@@ -341,8 +341,8 @@  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>';
     }
 
     /**
@@ -379,12 +379,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;
@@ -401,17 +401,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>';
 
             }
@@ -431,78 +431,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>';
 
             }
@@ -518,7 +518,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/Cmd.php 1 patch

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

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

Please login to merge, or discard this patch.

src/Cmd/Args.php 1 patch

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

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

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 {
		@@ -309,7 +309,7 @@ discard block
		block discarded – undo
309	309
310	310	if ($username && $password) {
311	311	$transport->setUsername($username)
312		- ->setPassword($password);
	312	+ ->setPassword($password);
313	313	}
314	314	if ($encryption) {
315	315	$transport->setEncryption($encryption);
		@@ -342,7 +342,7 @@ discard block
		block discarded – undo
342	342	protected function getHeaderHtml()
343	343	{
344	344	return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
345		- '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
	345	+ '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
346	346	}
347	347
348	348	/**
		@@ -380,11 +380,11 @@ discard block
		block discarded – undo
380	380	Str::appendPluralS('cleanup', $this->numCleanups)
381	381	);
382	382	$html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
383		- '<tr><td>' .
384		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
385		- '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
386		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
387		- '</td></tr>' .
	383	+ '<tr><td>' .
	384	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
	385	+ '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
	386	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
	387	+ '</td></tr>' .
388	388	'</table>';
389	389
390	390	return $html;
		@@ -445,65 +445,65 @@ discard block
		block discarded – undo
445	445	$status = 'FAILURE';
446	446	}
447	447	$html .= '<tr>' .
448		- '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
449		- sprintf('backup <em>%s</em>', $backup->getName()) .
450		- ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
451		- '</td>' .
452		- '</tr>' .
453		- '<tr>' .
454		- '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
455		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
456		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
457		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
458		- '</tr>';
	448	+ '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
	449	+ sprintf('backup <em>%s</em>', $backup->getName()) .
	450	+ ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
	451	+ '</td>' .
	452	+ '</tr>' .
	453	+ '<tr>' .
	454	+ '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
	455	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
	456	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
	457	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
	458	+ '</tr>';
459	459
460	460	$html .= '<tr>' .
461		- '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
462		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	461	+ '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
	462	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
463	463	$backup->checkCount() . '
464	464	</td>' .
465		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
	465	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
466	466
467	467	</td>' .
468		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	468	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
469	469	$backup->checkCountFailed() .
470		- '</td>' .
471		- '</tr>' .
472		- '<tr>' .
473		- '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
474		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	470	+ '</td>' .
	471	+ '</tr>' .
	472	+ '<tr>' .
	473	+ '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
	474	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
475	475	$backup->cryptCount() .
476		- '</td>' .
477		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	476	+ '</td>' .
	477	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
478	478	$backup->cryptCountSkipped() .
479		- '</td>' .
480		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	479	+ '</td>' .
	480	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
481	481	$backup->cryptCountFailed() .
482		- '</td>' .
483		- '</tr>' .
484		- '<tr>' .
485		- '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
486		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	482	+ '</td>' .
	483	+ '</tr>' .
	484	+ '<tr>' .
	485	+ '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
	486	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
487	487	$backup->syncCount() . '</td>' .
488		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	488	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
489	489	$backup->syncCountSkipped() .
490		- '</td>' .
491		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	490	+ '</td>' .
	491	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
492	492	$backup->syncCountFailed() .
493		- '</td>' .
494		- '</tr>' .
495		- '<tr>' .
496		- '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
497		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	493	+ '</td>' .
	494	+ '</tr>' .
	495	+ '<tr>' .
	496	+ '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
	497	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
498	498	$backup->cleanupCount() .
499		- '</td>' .
500		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	499	+ '</td>' .
	500	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
501	501	$backup->cleanupCountSkipped() .
502		- '</td>' .
503		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	502	+ '</td>' .
	503	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
504	504	$backup->cleanupCountFailed() .
505		- '</td>' .
506		- '</tr>';
	505	+ '</td>' .
	506	+ '</tr>';
507	507
508	508	}
509	509	$html .= '</table>';
		@@ -519,6 +519,6 @@ discard block
		block discarded – undo
519	519	protected function getFooterHtml()
520	520	{
521	521	return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
522		- '</td></tr></table>';
	522	+ '</td></tr></table>';
523	523	}
524	524	}

		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	$ret = self::EXIT_EXCEPTION;
98	98	}
99	99	} catch (\Exception $e) {
100		- echo $e->getMessage() . PHP_EOL;
	100	+ echo $e->getMessage().PHP_EOL;
101	101	$ret = self::EXIT_EXCEPTION;
102	102	}
103	103
		@@ -237,7 +237,7 @@ discard block
		block discarded – undo
237	237	{
238	238	$value = Arr::getValue($this->arguments, $arg);
239	239	if (!empty($value)) {
240		- $setter = 'set' . ucfirst($arg);
	240	+ $setter = 'set'.ucfirst($arg);
241	241	$configuration->{$setter}($value);
242	242	}
243	243	}
		@@ -252,21 +252,21 @@ discard block
		block discarded – undo
252	252	// check if upgrade is necessary
253	253	$latestVersion = $this->getLatestVersion();
254	254	if (!$this->isPharOutdated($latestVersion)) {
255		- echo 'You already have the latest version of phpbu installed.' . PHP_EOL;
	255	+ echo 'You already have the latest version of phpbu installed.'.PHP_EOL;
256	256	exit(self::EXIT_SUCCESS);
257	257	}
258	258
259	259	$remoteFilename = 'http://phar.phpbu.de/phpbu.phar';
260	260	$localFilename = realpath($_SERVER['argv'][0]);
261		- $tempFilename = basename($localFilename, '.phar') . '-temp.phar';
	261	+ $tempFilename = basename($localFilename, '.phar').'-temp.phar';
262	262
263		- echo 'Updating the phpbu PHAR to version ' . $latestVersion . ' ... ';
	263	+ echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... ';
264	264
265	265	$old = error_reporting(0);
266	266	$phar = file_get_contents($remoteFilename);
267	267	error_reporting($old);
268	268	if (!$phar) {
269		- echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL;
	269	+ echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL;
270	270	exit(self::EXIT_EXCEPTION);
271	271	}
272	272	file_put_contents($tempFilename, $phar);
		@@ -282,11 +282,11 @@ discard block
		block discarded – undo
282	282	} catch (Exception $e) {
283	283	// cleanup crappy phar
284	284	unlink($tempFilename);
285		- echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL;
	285	+ echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL;
286	286	exit(self::EXIT_EXCEPTION);
287	287	}
288	288
289		- echo 'done' . PHP_EOL;
	289	+ echo 'done'.PHP_EOL;
290	290	exit(self::EXIT_SUCCESS);
291	291	}
292	292
		@@ -299,10 +299,10 @@ discard block
		block discarded – undo
299	299
300	300	$latestVersion = $this->getLatestVersion();
301	301	if ($this->isPharOutdated($latestVersion)) {
302		- print 'You are not using the latest version of phpbu.' . PHP_EOL
303		- . 'Use "phpunit --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
	302	+ print 'You are not using the latest version of phpbu.'.PHP_EOL
	303	+ . 'Use "phpunit --self-update" to install phpbu '.$latestVersion.PHP_EOL;
304	304	} else {
305		- print 'You are using the latest version of phpbu.' . PHP_EOL;
	305	+ print 'You are using the latest version of phpbu.'.PHP_EOL;
306	306	}
307	307	exit(self::EXIT_SUCCESS);
308	308	}
		@@ -319,7 +319,7 @@ discard block
		block discarded – undo
319	319	$version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu');
320	320	error_reporting($old);
321	321	if (!$version) {
322		- echo 'Network-Error: Could not check latest version.' . PHP_EOL;
	322	+ echo 'Network-Error: Could not check latest version.'.PHP_EOL;
323	323	exit(self::EXIT_EXCEPTION);
324	324	}
325	325	return $version;
		@@ -345,7 +345,7 @@ discard block
		block discarded – undo
345	345	return;
346	346	}
347	347
348		- echo Version::getVersionString() . PHP_EOL . PHP_EOL;
	348	+ echo Version::getVersionString().PHP_EOL.PHP_EOL;
349	349	$this->isVersionStringPrinted = true;
350	350	}
351	351
		@@ -370,8 +370,8 @@ discard block
		block discarded – undo
370	370
371	371	EOT;
372	372	if ($this->isPhar) {
373		- echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL;
374		- echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL;
	373	+ echo ' --version-check Check whether phpbu is up to date.'.PHP_EOL;
	374	+ echo ' --self-update Upgrade phpbu to the latest version.'.PHP_EOL;
375	375	}
376	376	}
377	377
		@@ -385,7 +385,7 @@ discard block
		block discarded – undo
385	385	{
386	386	$help = $hint ? ', use "phpbu -h" for help' : '';
387	387	$this->printVersionString();
388		- echo $message . $help . PHP_EOL;
	388	+ echo $message.$help.PHP_EOL;
389	389	exit(self::EXIT_EXCEPTION);
390	390	}
391	391

		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	public function __construct(bool $isPhar = false)
55	55	{
56	56	if ($isPhar) {
57		- $this->longOptions['self-update'] = true;
	57	+ $this->longOptions['self-update'] = true;
58	58	$this->longOptions['version-check'] = true;
59	59	}
60	60	}
		@@ -102,9 +102,9 @@ discard block
		block discarded – undo
102	102	public function parseShortOption($arg, array &$options)
103	103	{
104	104	if (!isset($this->shortOptions[$arg])) {
105		- throw new Exception('unknown option: -' . $arg);
	105	+ throw new Exception('unknown option: -'.$arg);
106	106	}
107		- $options['-' . $arg] = true;
	107	+ $options['-'.$arg] = true;
108	108	}
109	109
110	110	/**
		@@ -124,17 +124,17 @@ discard block
		block discarded – undo
124	124	$argument = $list[1];
125	125	}
126	126	if (count($list) > 2) {
127		- throw new Exception('invalid value for option: --' . $arg);
	127	+ throw new Exception('invalid value for option: --'.$arg);
128	128	}
129		- if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) {
130		- throw new Exception('unknown option: --' . $option);
	129	+ if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) {
	130	+ throw new Exception('unknown option: --'.$option);
131	131	}
132		- if ($argument === true && isset($this->longOptions[$option . '='])) {
133		- throw new Exception('argument required for option: --' . $option);
	132	+ if ($argument === true && isset($this->longOptions[$option.'='])) {
	133	+ throw new Exception('argument required for option: --'.$option);
134	134	}
135	135	if ($argument !== true && isset($this->longOptions[$option])) {
136		- throw new Exception('needless argument for option: --' . $option);
	136	+ throw new Exception('needless argument for option: --'.$option);
137	137	}
138		- $options['--' . $option] = $argument;
	138	+ $options['--'.$option] = $argument;
139	139	}
140	140	}

		@@ -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 */
		@@ -327,9 +327,9 @@ discard block
		block discarded – undo
327	327	{
328	328	if (isset($options['sendmail.path'])) {
329	329	$path = $options['sendmail.path'];
330		- $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
	330	+ $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
331	331	/* @var $transport \Swift_SendmailTransport */
332		- return \Swift_SendmailTransport::newInstance($path . $options);
	332	+ return \Swift_SendmailTransport::newInstance($path.$options);
333	333	}
334	334	return \Swift_SendmailTransport::newInstance();
335	335	}
		@@ -341,8 +341,8 @@ discard block
		block discarded – undo
341	341	*/
342	342	protected function getHeaderHtml()
343	343	{
344		- return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
345		- '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
	344	+ return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'.
	345	+ '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>';
346	346	}
347	347
348	348	/**
		@@ -379,12 +379,12 @@ discard block
		block discarded – undo
379	379	$this->numCleanups,
380	380	Str::appendPluralS('cleanup', $this->numCleanups)
381	381	);
382		- $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
383		- '<tr><td>' .
384		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
385		- '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
386		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
387		- '</td></tr>' .
	382	+ $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'.
	383	+ '<tr><td>'.
	384	+ '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'.
	385	+ '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'.
	386	+ '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'.
	387	+ '</td></tr>'.
388	388	'</table>';
389	389
390	390	return $html;
		@@ -401,17 +401,17 @@ discard block
		block discarded – undo
401	401	$html = '';
402	402	$errors = $result->getErrors();
403	403	if (count($errors)) {
404		- $html .= '<table ' . TPL::getSnippet('sTableError') . '>';
	404	+ $html .= '<table '.TPL::getSnippet('sTableError').'>';
405	405	/* @var $e Exception */
406	406	foreach ($errors as $e) {
407		- $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' .
	407	+ $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'.
408	408	sprintf(
409	409	"Exception '%s' with message '%s' in %s:%d",
410	410	get_class($e),
411	411	$e->getMessage(),
412	412	$e->getFile(),
413	413	$e->getLine()
414		- ) .
	414	+ ).
415	415	'</td></tr>';
416	416
417	417	}
		@@ -431,78 +431,78 @@ discard block
		block discarded – undo
431	431	$html = '';
432	432	$backups = $result->getBackups();
433	433	if (count($backups)) {
434		- $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>';
	434	+ $html .= '<table '.TPL::getSnippet('sTableBackup').'>';
435	435	/** @var \phpbu\App\Result\Backup $backup */
436	436	foreach ($backups as $backup) {
437	437	if ($backup->allOk()) {
438	438	$color = TPL::getSnippet('cStatusOK');
439	439	$status = 'OK';
440		- } elseif($backup->okButSkipsOrFails()) {
	440	+ } elseif ($backup->okButSkipsOrFails()) {
441	441	$color = TPL::getSnippet('cStatusWARN');
442	442	$status = 'WARNING';
443	443	} else {
444	444	$color = TPL::getSnippet('cStatusFAIL');
445	445	$status = 'FAILURE';
446	446	}
447		- $html .= '<tr>' .
448		- '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
449		- sprintf('backup <em>%s</em>', $backup->getName()) .
450		- ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
451		- '</td>' .
452		- '</tr>' .
453		- '<tr>' .
454		- '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
455		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
456		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
457		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
	447	+ $html .= '<tr>'.
	448	+ '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'.
	449	+ sprintf('backup <em>%s</em>', $backup->getName()).
	450	+ ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'.
	451	+ '</td>'.
	452	+ '</tr>'.
	453	+ '<tr>'.
	454	+ '<td '.TPL::getSnippet('sRowHead').'> </td>'.
	455	+ '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'.
	456	+ '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'.
	457	+ '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'.
458	458	'</tr>';
459	459
460		- $html .= '<tr>' .
461		- '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
462		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
463		- $backup->checkCount() . '
	460	+ $html .= '<tr>'.
	461	+ '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'.
	462	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
	463	+ $backup->checkCount().'
464	464	</td>' .
465		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
	465	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">
466	466
467	467	</td>' .
468		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
469		- $backup->checkCountFailed() .
470		- '</td>' .
471		- '</tr>' .
472		- '<tr>' .
473		- '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
474		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
475		- $backup->cryptCount() .
476		- '</td>' .
477		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
478		- $backup->cryptCountSkipped() .
479		- '</td>' .
480		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
481		- $backup->cryptCountFailed() .
482		- '</td>' .
483		- '</tr>' .
484		- '<tr>' .
485		- '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
486		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
487		- $backup->syncCount() . '</td>' .
488		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
489		- $backup->syncCountSkipped() .
490		- '</td>' .
491		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
492		- $backup->syncCountFailed() .
493		- '</td>' .
494		- '</tr>' .
495		- '<tr>' .
496		- '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
497		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
498		- $backup->cleanupCount() .
499		- '</td>' .
500		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
501		- $backup->cleanupCountSkipped() .
502		- '</td>' .
503		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
504		- $backup->cleanupCountFailed() .
505		- '</td>' .
	468	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
	469	+ $backup->checkCountFailed().
	470	+ '</td>'.
	471	+ '</tr>'.
	472	+ '<tr>'.
	473	+ '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'.
	474	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	475	+ $backup->cryptCount().
	476	+ '</td>'.
	477	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	478	+ $backup->cryptCountSkipped().
	479	+ '</td>'.
	480	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	481	+ $backup->cryptCountFailed().
	482	+ '</td>'.
	483	+ '</tr>'.
	484	+ '<tr>'.
	485	+ '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'.
	486	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	487	+ $backup->syncCount().'</td>'.
	488	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	489	+ $backup->syncCountSkipped().
	490	+ '</td>'.
	491	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	492	+ $backup->syncCountFailed().
	493	+ '</td>'.
	494	+ '</tr>'.
	495	+ '<tr>'.
	496	+ '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'.
	497	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	498	+ $backup->cleanupCount().
	499	+ '</td>'.
	500	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	501	+ $backup->cleanupCountSkipped().
	502	+ '</td>'.
	503	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	504	+ $backup->cleanupCountFailed().
	505	+ '</td>'.
506	506	'</tr>';
507	507
508	508	}
		@@ -518,7 +518,7 @@ discard block
		block discarded – undo
518	518	*/
519	519	protected function getFooterHtml()
520	520	{
521		- return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
	521	+ return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'.
522	522	'</td></tr></table>';
523	523	}
524	524	}

sebastianfeldmann / phpbu

Push — master ( 98071e...5af57d )

Status

Category

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

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

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