Inspection of "Fix option name typo" - sebastianfeldmann/phpbu - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 67f111...ee3fe7 )

by Sebastian

created 2016-05-19 14:32 UTC

Status

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

@@ -148,8 +148,8 @@  discard block
 block discarded – undo
         $mails                 = $options['recipients'];
         $server                = gethostname();
         $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false);
-        $this->subject         = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server);
-        $this->senderMail      = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server);
+        $this->subject         = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server);
+        $this->senderMail      = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server);
         $this->senderName      = Arr::getValue($options, 'sender.name');
         $this->transportType   = Arr::getValue($options, 'transport', 'mail');
         $this->recipients      = array_map('trim', explode(';', $mails));
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
             $errors  = $this->getErrorHtml($result);
             $info    = $this->getInfoHtml($result);
             $footer  = $this->getFooterHtml();
-            $body    = '<html><body '. TPL::getSnippet('sBody') . '>'
+            $body    = '<html><body '.TPL::getSnippet('sBody').'>'
                      . $header
                      . $status
                      . $errors
                      . $info
                      . $footer
                      . '</body></html>';
-            $sent    = null;
+            $sent = null;
 
             try {
                 /** @var \Swift_Message $message */
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
             throw new Exception('option \'sendmail.path\' ist missing');
         }
         $path    = $options['sendmail.path'];
-        $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
+        $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
 
         /* @var $transport \Swift_SendmailTransport */
-        $transport = \Swift_SendmailTransport::newInstance($path . $options);
+        $transport = \Swift_SendmailTransport::newInstance($path.$options);
 
         return $transport;
     }
@@ -349,8 +349,8 @@  discard block
 block discarded – undo
      */
     protected function getHeaderHtml()
     {
-        return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
-                 '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
+        return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'.
+                 '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>';
     }
 
     /**
@@ -387,12 +387,12 @@  discard block
 block discarded – undo
             $this->numCleanups,
             Str::appendPluralS('cleanup', $this->numCleanups)
         );
-        $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
-                 '<tr><td>' .
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
-                  '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
-                 '</td></tr>' .
+        $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'.
+                 '<tr><td>'.
+                  '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'.
+                  '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'.
+                  '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'.
+                 '</td></tr>'.
                 '</table>';
 
         return $html;
@@ -409,17 +409,17 @@  discard block
 block discarded – undo
         $html   = '';
         $errors = $result->getErrors();
         if (count($errors)) {
-            $html .= '<table ' . TPL::getSnippet('sTableError') . '>';
+            $html .= '<table '.TPL::getSnippet('sTableError').'>';
             /* @var $e Exception */
             foreach ($errors as $e) {
-                $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' .
+                $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'.
                     sprintf(
                         "Exception '%s' with message '%s' in %s:%d",
                         get_class($e),
                         $e->getMessage(),
                         $e->getFile(),
                         $e->getLine()
-                    ) .
+                    ).
                     '</td></tr>';
 
             }
@@ -439,78 +439,78 @@  discard block
 block discarded – undo
         $html    = '';
         $backups = $result->getBackups();
         if (count($backups)) {
-            $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>';
+            $html .= '<table '.TPL::getSnippet('sTableBackup').'>';
             /** @var \phpbu\App\Result\Backup $backup */
             foreach ($backups as $backup) {
                 if ($backup->allOk()) {
                     $color  = TPL::getSnippet('cStatusOK');
                     $status = 'OK';
-                } elseif($backup->okButSkipsOrFails()) {
+                } elseif ($backup->okButSkipsOrFails()) {
                     $color  = TPL::getSnippet('cStatusWARN');
                     $status = 'WARNING';
                 } else {
                     $color  = TPL::getSnippet('cStatusFAIL');
                     $status = 'FAILURE';
                 }
-                $html .= '<tr>' .
-                          '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
-                          sprintf('backup <em>%s</em>', $backup->getName()) .
-                          ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . '>&nbsp;</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
+                $html .= '<tr>'.
+                          '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'.
+                          sprintf('backup <em>%s</em>', $backup->getName()).
+                          ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'.
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowHead').'>&nbsp;</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'.
                          '</tr>';
 
-                $html .= '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
-                            $backup->checkCount() . '
+                $html .= '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'.
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
+                            $backup->checkCount().'
                            </td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">
                             &nbsp;
                            </td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
-                            $backup->checkCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCount() . '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCountFailed() .
-                          '</td>' .
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
+                            $backup->checkCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCount().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCount().'</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCount().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCountFailed().
+                          '</td>'.
                          '</tr>';
 
             }
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
      */
     protected function getFooterHtml()
     {
-        return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
+        return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'.
                '</td></tr></table>';
     }
 }

Please login to merge, or discard this patch.

src/Log/MailTemplate.php 1 patch

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

@@ -47,39 +47,39 @@
 block discarded – undo
     public static function setDefaultSnippets()
     {
         self::setSnippets(array(
-            'sBody'                    => 'style="font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'background-color:#343b43; ' .
-                                                 'font-size: 15px; margin:0; ' .
+            'sBody'                    => 'style="font-family: Arial, Helvetica, sans-serif; '.
+                                                 'background-color:#343b43; '.
+                                                 'font-size: 15px; margin:0; '.
                                                  'padding:0;"',
-            'sTableHeader'             => 'style="width:100%; ' .
-                                                 'font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'margin:0; color:#e6e6e6;" ' .
+            'sTableHeader'             => 'style="width:100%; '.
+                                                 'font-family: Arial, Helvetica, sans-serif; '.
+                                                 'margin:0; color:#e6e6e6;" '.
                                           'align="center" cellpadding="5" cellspacing="0"',
-            'sTableError'              => 'style="width:100%; ' .
-                                                 'background-color:#e6e6e6; ' .
-                                                 'margin:0 auto 15px; ' .
-                                                 'border:1px solid #011516;" ' .
+            'sTableError'              => 'style="width:100%; '.
+                                                 'background-color:#e6e6e6; '.
+                                                 'margin:0 auto 15px; '.
+                                                 'border:1px solid #011516;" '.
                                           'align="center" cellpadding="5" cellspacing="0"',
-            'sTableErrorCol'           => 'style="border-top: 1px solid #f6f6f6; ' .
+            'sTableErrorCol'           => 'style="border-top: 1px solid #f6f6f6; '.
                                                  'border-bottom: 1px solid #c9c9c9;"',
-            'sTableContent'            => 'style="width:380px; ' .
-                                                 'font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'margin:0 auto;" ' .
+            'sTableContent'            => 'style="width:380px; '.
+                                                 'font-family: Arial, Helvetica, sans-serif; '.
+                                                 'margin:0 auto;" '.
                                           'align="center" cellpadding="0" cellspacing="0"',
             'sTableContentCol'         => 'style="padding:0 10px;"',
-            'sTableStatus'             => 'style="background-color:#%s; ' .
-                                                 'width:100%%; ' .
-                                                 'margin:0 auto 15px; ' .
-                                                 'border:1px solid #011516;" ' .
+            'sTableStatus'             => 'style="background-color:#%s; '.
+                                                 'width:100%%; '.
+                                                 'margin:0 auto 15px; '.
+                                                 'border:1px solid #011516;" '.
                                           'align="center" cellpadding="10" cellspacing="0"',
             'sTableStatusHead'         => 'style="margin:0;"',
             'sTableStatusText'         => 'style="font-size:16px;"',
-            'sTableBackup'             => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'background-color:#e6e6e6; ' .
-                                                 'margin:0 0 15px; ' .
-                                                 'border:1px solid #011516;" ' .
+            'sTableBackup'             => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; '.
+                                                 'background-color:#e6e6e6; '.
+                                                 'margin:0 0 15px; '.
+                                                 'border:1px solid #011516;" '.
                                           'align="center" cellpadding="5" cellspacing="0" width="100%"',
-            'sTableBackupStatusColumn' => 'style="background-color:#%s; ' .
+            'sTableBackupStatusColumn' => 'style="background-color:#%s; '.
                                                  'border-bottom:1px solid #747474;"',
             'sTableBackupStatusText'   => 'style="float:right;"',
             'sRowHead'                 => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"',

Please login to merge, or discard this patch.

build/phar-manifest.php 1 patch

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

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

Please login to merge, or discard this patch.

build/phar-patch.php 1 patch

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

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
 $replacements = array();
 
 foreach ($patches as $file) {
-    echo 'patching file: ' . $file['path'] . "...";
+    echo 'patching file: '.$file['path']."...";
     file_put_contents(
         $file['path'],
         str_replace(
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
             file_get_contents($file['path'])
         )
     );
-    echo ' done' . PHP_EOL;
+    echo ' done'.PHP_EOL;
 };
 
 foreach ($replacements as $file) {
-    echo 'replacing file: ' . $file['path'] . "...";
+    echo 'replacing file: '.$file['path']."...";
     file_put_contents($file['path'], $file['content']);
-    echo ' done' . PHP_EOL;
+    echo ' done'.PHP_EOL;
 }

Please login to merge, or discard this patch.

build/phar-version.php 1 patch

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

@@ -11,11 +11,11 @@
 block discarded – undo
 }
 
 file_put_contents(
-    __DIR__ . '/phar/Version.php',
+    __DIR__.'/phar/Version.php',
     str_replace(
         'private static $pharVersion;',
-        'private static $pharVersion = "' . $version . '";',
-        file_get_contents(__DIR__ . '/phar/Version.php')
+        'private static $pharVersion = "'.$version.'";',
+        file_get_contents(__DIR__.'/phar/Version.php')
     )
 );
 

Please login to merge, or discard this patch.

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

		@@ -47,39 +47,39 @@
		block discarded – undo
47	47	public static function setDefaultSnippets()
48	48	{
49	49	self::setSnippets(array(
50		- 'sBody' => 'style="font-family: Arial, Helvetica, sans-serif; ' .
51		- 'background-color:#343b43; ' .
52		- 'font-size: 15px; margin:0; ' .
	50	+ 'sBody' => 'style="font-family: Arial, Helvetica, sans-serif; '.
	51	+ 'background-color:#343b43; '.
	52	+ 'font-size: 15px; margin:0; '.
53	53	'padding:0;"',
54		- 'sTableHeader' => 'style="width:100%; ' .
55		- 'font-family: Arial, Helvetica, sans-serif; ' .
56		- 'margin:0; color:#e6e6e6;" ' .
	54	+ 'sTableHeader' => 'style="width:100%; '.
	55	+ 'font-family: Arial, Helvetica, sans-serif; '.
	56	+ 'margin:0; color:#e6e6e6;" '.
57	57	'align="center" cellpadding="5" cellspacing="0"',
58		- 'sTableError' => 'style="width:100%; ' .
59		- 'background-color:#e6e6e6; ' .
60		- 'margin:0 auto 15px; ' .
61		- 'border:1px solid #011516;" ' .
	58	+ 'sTableError' => 'style="width:100%; '.
	59	+ 'background-color:#e6e6e6; '.
	60	+ 'margin:0 auto 15px; '.
	61	+ 'border:1px solid #011516;" '.
62	62	'align="center" cellpadding="5" cellspacing="0"',
63		- 'sTableErrorCol' => 'style="border-top: 1px solid #f6f6f6; ' .
	63	+ 'sTableErrorCol' => 'style="border-top: 1px solid #f6f6f6; '.
64	64	'border-bottom: 1px solid #c9c9c9;"',
65		- 'sTableContent' => 'style="width:380px; ' .
66		- 'font-family: Arial, Helvetica, sans-serif; ' .
67		- 'margin:0 auto;" ' .
	65	+ 'sTableContent' => 'style="width:380px; '.
	66	+ 'font-family: Arial, Helvetica, sans-serif; '.
	67	+ 'margin:0 auto;" '.
68	68	'align="center" cellpadding="0" cellspacing="0"',
69	69	'sTableContentCol' => 'style="padding:0 10px;"',
70		- 'sTableStatus' => 'style="background-color:#%s; ' .
71		- 'width:100%%; ' .
72		- 'margin:0 auto 15px; ' .
73		- 'border:1px solid #011516;" ' .
	70	+ 'sTableStatus' => 'style="background-color:#%s; '.
	71	+ 'width:100%%; '.
	72	+ 'margin:0 auto 15px; '.
	73	+ 'border:1px solid #011516;" '.
74	74	'align="center" cellpadding="10" cellspacing="0"',
75	75	'sTableStatusHead' => 'style="margin:0;"',
76	76	'sTableStatusText' => 'style="font-size:16px;"',
77		- 'sTableBackup' => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; ' .
78		- 'background-color:#e6e6e6; ' .
79		- 'margin:0 0 15px; ' .
80		- 'border:1px solid #011516;" ' .
	77	+ 'sTableBackup' => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; '.
	78	+ 'background-color:#e6e6e6; '.
	79	+ 'margin:0 0 15px; '.
	80	+ 'border:1px solid #011516;" '.
81	81	'align="center" cellpadding="5" cellspacing="0" width="100%"',
82		- 'sTableBackupStatusColumn' => 'style="background-color:#%s; ' .
	82	+ 'sTableBackupStatusColumn' => 'style="background-color:#%s; '.
83	83	'border-bottom:1px solid #747474;"',
84	84	'sTableBackupStatusText' => 'style="float:right;"',
85	85	'sRowHead' => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"',

		@@ -9,17 +9,17 @@
		block discarded – undo
9	9	} else {
10	10	$branch = @exec('git rev-parse --abbrev-ref HEAD');
11	11	$hash = @exec('git log -1 --format="%H"');
12		- echo $branch . '@' . $hash;
	12	+ echo $branch.'@'.$hash;
13	13	}
14	14	echo PHP_EOL;
15	15
16		-$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock'));
	16	+$lock = json_decode(file_get_contents(__DIR__.'/../composer.lock'));
17	17	$packages = array_merge($lock->packages, $lock->{"packages-dev"});
18	18
19	19	foreach ($packages as $package) {
20		- echo $package->name . ': ' . $package->version;
	20	+ echo $package->name.': '.$package->version;
21	21	if (!preg_match('/^[v= ](([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:])?)?)?)?)$/', $package->version)) {
22		- echo '@' . $package->source->reference;
	22	+ echo '@'.$package->source->reference;
23	23	}
24	24	echo PHP_EOL;
25	25	}

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	$replacements = array();
7	7
8	8	foreach ($patches as $file) {
9		- echo 'patching file: ' . $file['path'] . "...";
	9	+ echo 'patching file: '.$file['path']."...";
10	10	file_put_contents(
11	11	$file['path'],
12	12	str_replace(
		@@ -15,11 +15,11 @@ discard block
		block discarded – undo
15	15	file_get_contents($file['path'])
16	16	)
17	17	);
18		- echo ' done' . PHP_EOL;
	18	+ echo ' done'.PHP_EOL;
19	19	};
20	20
21	21	foreach ($replacements as $file) {
22		- echo 'replacing file: ' . $file['path'] . "...";
	22	+ echo 'replacing file: '.$file['path']."...";
23	23	file_put_contents($file['path'], $file['content']);
24		- echo ' done' . PHP_EOL;
	24	+ echo ' done'.PHP_EOL;
25	25	}

		@@ -11,11 +11,11 @@
		block discarded – undo
11	11	}
12	12
13	13	file_put_contents(
14		- __DIR__ . '/phar/Version.php',
	14	+ __DIR__.'/phar/Version.php',
15	15	str_replace(
16	16	'private static $pharVersion;',
17		- 'private static $pharVersion = "' . $version . '";',
18		- file_get_contents(__DIR__ . '/phar/Version.php')
	17	+ 'private static $pharVersion = "'.$version.'";',
	18	+ file_get_contents(__DIR__.'/phar/Version.php')
19	19	)
20	20	);
21	21

sebastianfeldmann / phpbu

Push — master ( 67f111...ee3fe7 )

Status

Category

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

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

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

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

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