Inspection of "Make 'Mail' logger simulation aware - issue #115" - sebastianfeldmann/phpbu - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 990803...ccde76 )

by Sebastian

created 2018-05-04 13:01 UTC

Status

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

@@ -192,12 +192,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;
             $state   = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
 
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
 
         if ($username && $password) {
             $transport->setUsername($username)
-                      ->setPassword($password);
+                        ->setPassword($password);
         }
         if ($encryption) {
             $transport->setEncryption($encryption);
@@ -373,7 +373,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>';
     }
 
     /**
@@ -411,11 +411,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;
@@ -476,65 +476,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>';
@@ -550,6 +550,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 +75 added lines, -75 removed lines patch added patch discarded remove patch

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

		@@ -192,12 +192,12 @@ discard block
		block discarded – undo
192	192	$info = $this->getInfoHtml($result);
193	193	$footer = $this->getFooterHtml();
194	194	$body = '<html><body '. TPL::getSnippet('sBody') . '>'
195		- . $header
196		- . $status
197		- . $errors
198		- . $info
199		- . $footer
200		- . '</body></html>';
	195	+ . $header
	196	+ . $status
	197	+ . $errors
	198	+ . $info
	199	+ . $footer
	200	+ . '</body></html>';
201	201	$sent = null;
202	202	$state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
203	203
		@@ -340,7 +340,7 @@ discard block
		block discarded – undo
340	340
341	341	if ($username && $password) {
342	342	$transport->setUsername($username)
343		- ->setPassword($password);
	343	+ ->setPassword($password);
344	344	}
345	345	if ($encryption) {
346	346	$transport->setEncryption($encryption);
		@@ -373,7 +373,7 @@ discard block
		block discarded – undo
373	373	protected function getHeaderHtml()
374	374	{
375	375	return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
376		- '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
	376	+ '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
377	377	}
378	378
379	379	/**
		@@ -411,11 +411,11 @@ discard block
		block discarded – undo
411	411	Str::appendPluralS('cleanup', $this->numCleanups)
412	412	);
413	413	$html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
414		- '<tr><td>' .
415		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
416		- '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
417		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
418		- '</td></tr>' .
	414	+ '<tr><td>' .
	415	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
	416	+ '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
	417	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
	418	+ '</td></tr>' .
419	419	'</table>';
420	420
421	421	return $html;
		@@ -476,65 +476,65 @@ discard block
		block discarded – undo
476	476	$status = 'FAILURE';
477	477	}
478	478	$html .= '<tr>' .
479		- '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
480		- sprintf('backup <em>%s</em>', $backup->getName()) .
481		- ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
482		- '</td>' .
483		- '</tr>' .
484		- '<tr>' .
485		- '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
486		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
487		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
488		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
489		- '</tr>';
	479	+ '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
	480	+ sprintf('backup <em>%s</em>', $backup->getName()) .
	481	+ ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
	482	+ '</td>' .
	483	+ '</tr>' .
	484	+ '<tr>' .
	485	+ '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
	486	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
	487	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
	488	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
	489	+ '</tr>';
490	490
491	491	$html .= '<tr>' .
492		- '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
493		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	492	+ '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
	493	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
494	494	$backup->checkCount() . '
495	495	</td>' .
496		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
	496	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
497	497
498	498	</td>' .
499		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	499	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
500	500	$backup->checkCountFailed() .
501		- '</td>' .
502		- '</tr>' .
503		- '<tr>' .
504		- '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
505		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	501	+ '</td>' .
	502	+ '</tr>' .
	503	+ '<tr>' .
	504	+ '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
	505	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
506	506	$backup->cryptCount() .
507		- '</td>' .
508		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	507	+ '</td>' .
	508	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
509	509	$backup->cryptCountSkipped() .
510		- '</td>' .
511		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	510	+ '</td>' .
	511	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
512	512	$backup->cryptCountFailed() .
513		- '</td>' .
514		- '</tr>' .
515		- '<tr>' .
516		- '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
517		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	513	+ '</td>' .
	514	+ '</tr>' .
	515	+ '<tr>' .
	516	+ '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
	517	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
518	518	$backup->syncCount() . '</td>' .
519		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	519	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
520	520	$backup->syncCountSkipped() .
521		- '</td>' .
522		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	521	+ '</td>' .
	522	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
523	523	$backup->syncCountFailed() .
524		- '</td>' .
525		- '</tr>' .
526		- '<tr>' .
527		- '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
528		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	524	+ '</td>' .
	525	+ '</tr>' .
	526	+ '<tr>' .
	527	+ '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
	528	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
529	529	$backup->cleanupCount() .
530		- '</td>' .
531		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	530	+ '</td>' .
	531	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
532	532	$backup->cleanupCountSkipped() .
533		- '</td>' .
534		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	533	+ '</td>' .
	534	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
535	535	$backup->cleanupCountFailed() .
536		- '</td>' .
537		- '</tr>';
	536	+ '</td>' .
	537	+ '</tr>';
538	538
539	539	}
540	540	$html .= '</table>';
		@@ -550,6 +550,6 @@ discard block
		block discarded – undo
550	550	protected function getFooterHtml()
551	551	{
552	552	return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
553		- '</td></tr></table>';
	553	+ '</td></tr></table>';
554	554	}
555	555	}

		@@ -163,8 +163,8 @@ discard block
		block discarded – undo
163	163	$server = gethostname();
164	164	$this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false);
165	165	$this->sendSimulating = Str::toBoolean(Arr::getValue($options, 'sendOnSimulation'), true);
166		- $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server);
167		- $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server);
	166	+ $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server);
	167	+ $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server);
168	168	$this->senderName = Arr::getValue($options, 'sender.name');
169	169	$this->transportType = Arr::getValue($options, 'transport', 'mail');
170	170	$this->recipients = array_map('trim', explode(';', $mails));
		@@ -183,7 +183,7 @@ discard block
		block discarded – undo
183	183	*/
184	184	public function onPhpbuEnd(Event\App\End $event)
185	185	{
186		- $result = $event->getResult();
	186	+ $result = $event->getResult();
187	187
188	188	if ($this->shouldMailBeSend($result)) {
189	189	$header = $this->getHeaderHtml();
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	$errors = $this->getErrorHtml($result);
192	192	$info = $this->getInfoHtml($result);
193	193	$footer = $this->getFooterHtml();
194		- $body = '<html><body '. TPL::getSnippet('sBody') . '>'
	194	+ $body = '<html><body '.TPL::getSnippet('sBody').'>'
195	195	. $header
196	196	. $status
197	197	. $errors
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	try {
205	205	/** @var \Swift_Message $message */
206	206	$message = new Swift_Message();
207		- $message->setSubject($this->subject . ' [' . $state . ']')
	207	+ $message->setSubject($this->subject.' ['.$state.']')
208	208	->setFrom($this->senderMail, $this->senderName)
209	209	->setTo($this->recipients)
210	210	->setBody($body, 'text/html');
		@@ -358,9 +358,9 @@ discard block
		block discarded – undo
358	358	{
359	359	if (isset($options['sendmail.path'])) {
360	360	$path = $options['sendmail.path'];
361		- $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
	361	+ $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
362	362	/* @var $transport \Swift_SendmailTransport */
363		- return new \Swift_SendmailTransport($path . $options);
	363	+ return new \Swift_SendmailTransport($path.$options);
364	364	}
365	365	return new \Swift_SendmailTransport();
366	366	}
		@@ -372,8 +372,8 @@ discard block
		block discarded – undo
372	372	*/
373	373	protected function getHeaderHtml()
374	374	{
375		- return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
376		- '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
	375	+ return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'.
	376	+ '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>';
377	377	}
378	378
379	379	/**
		@@ -410,12 +410,12 @@ discard block
		block discarded – undo
410	410	$this->numCleanups,
411	411	Str::appendPluralS('cleanup', $this->numCleanups)
412	412	);
413		- $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
414		- '<tr><td>' .
415		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
416		- '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
417		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
418		- '</td></tr>' .
	413	+ $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'.
	414	+ '<tr><td>'.
	415	+ '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'.
	416	+ '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'.
	417	+ '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'.
	418	+ '</td></tr>'.
419	419	'</table>';
420	420
421	421	return $html;
		@@ -432,17 +432,17 @@ discard block
		block discarded – undo
432	432	$html = '';
433	433	$errors = $result->getErrors();
434	434	if (count($errors)) {
435		- $html .= '<table ' . TPL::getSnippet('sTableError') . '>';
	435	+ $html .= '<table '.TPL::getSnippet('sTableError').'>';
436	436	/* @var $e Exception */
437	437	foreach ($errors as $e) {
438		- $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' .
	438	+ $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'.
439	439	sprintf(
440	440	"Exception '%s' with message '%s' in %s:%d",
441	441	get_class($e),
442	442	$e->getMessage(),
443	443	$e->getFile(),
444	444	$e->getLine()
445		- ) .
	445	+ ).
446	446	'</td></tr>';
447	447
448	448	}
		@@ -462,78 +462,78 @@ discard block
		block discarded – undo
462	462	$html = '';
463	463	$backups = $result->getBackups();
464	464	if (count($backups)) {
465		- $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>';
	465	+ $html .= '<table '.TPL::getSnippet('sTableBackup').'>';
466	466	/** @var \phpbu\App\Result\Backup $backup */
467	467	foreach ($backups as $backup) {
468	468	if ($backup->allOk()) {
469	469	$color = TPL::getSnippet('cStatusOK');
470	470	$status = 'OK';
471		- } elseif($backup->okButSkipsOrFails()) {
	471	+ } elseif ($backup->okButSkipsOrFails()) {
472	472	$color = TPL::getSnippet('cStatusWARN');
473	473	$status = 'WARNING';
474	474	} else {
475	475	$color = TPL::getSnippet('cStatusFAIL');
476	476	$status = 'FAILURE';
477	477	}
478		- $html .= '<tr>' .
479		- '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
480		- sprintf('backup <em>%s</em>', $backup->getName()) .
481		- ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
482		- '</td>' .
483		- '</tr>' .
484		- '<tr>' .
485		- '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
486		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
487		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
488		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
	478	+ $html .= '<tr>'.
	479	+ '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'.
	480	+ sprintf('backup <em>%s</em>', $backup->getName()).
	481	+ ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'.
	482	+ '</td>'.
	483	+ '</tr>'.
	484	+ '<tr>'.
	485	+ '<td '.TPL::getSnippet('sRowHead').'> </td>'.
	486	+ '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'.
	487	+ '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'.
	488	+ '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'.
489	489	'</tr>';
490	490
491		- $html .= '<tr>' .
492		- '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
493		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
494		- $backup->checkCount() . '
	491	+ $html .= '<tr>'.
	492	+ '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'.
	493	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
	494	+ $backup->checkCount().'
495	495	</td>' .
496		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
	496	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">
497	497
498	498	</td>' .
499		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
500		- $backup->checkCountFailed() .
501		- '</td>' .
502		- '</tr>' .
503		- '<tr>' .
504		- '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
505		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
506		- $backup->cryptCount() .
507		- '</td>' .
508		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
509		- $backup->cryptCountSkipped() .
510		- '</td>' .
511		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
512		- $backup->cryptCountFailed() .
513		- '</td>' .
514		- '</tr>' .
515		- '<tr>' .
516		- '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
517		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
518		- $backup->syncCount() . '</td>' .
519		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
520		- $backup->syncCountSkipped() .
521		- '</td>' .
522		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
523		- $backup->syncCountFailed() .
524		- '</td>' .
525		- '</tr>' .
526		- '<tr>' .
527		- '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
528		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
529		- $backup->cleanupCount() .
530		- '</td>' .
531		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
532		- $backup->cleanupCountSkipped() .
533		- '</td>' .
534		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
535		- $backup->cleanupCountFailed() .
536		- '</td>' .
	499	+ '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
	500	+ $backup->checkCountFailed().
	501	+ '</td>'.
	502	+ '</tr>'.
	503	+ '<tr>'.
	504	+ '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'.
	505	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	506	+ $backup->cryptCount().
	507	+ '</td>'.
	508	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	509	+ $backup->cryptCountSkipped().
	510	+ '</td>'.
	511	+ '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
	512	+ $backup->cryptCountFailed().
	513	+ '</td>'.
	514	+ '</tr>'.
	515	+ '<tr>'.
	516	+ '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'.
	517	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	518	+ $backup->syncCount().'</td>'.
	519	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	520	+ $backup->syncCountSkipped().
	521	+ '</td>'.
	522	+ '<td '.TPL::getSnippet('sRowSync').' align="right">'.
	523	+ $backup->syncCountFailed().
	524	+ '</td>'.
	525	+ '</tr>'.
	526	+ '<tr>'.
	527	+ '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'.
	528	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	529	+ $backup->cleanupCount().
	530	+ '</td>'.
	531	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	532	+ $backup->cleanupCountSkipped().
	533	+ '</td>'.
	534	+ '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
	535	+ $backup->cleanupCountFailed().
	536	+ '</td>'.
537	537	'</tr>';
538	538
539	539	}
		@@ -549,7 +549,7 @@ discard block
		block discarded – undo
549	549	*/
550	550	protected function getFooterHtml()
551	551	{
552		- return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
	552	+ return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'.
553	553	'</td></tr></table>';
554	554	}
555	555	}

sebastianfeldmann / phpbu

Push — master ( 990803...ccde76 )

Status

Category

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

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