Inspection of "Allow tar exit code 1 - issue #114" - sebastianfeldmann/phpbu - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c70526...35413c )

by Sebastian

created 2017-09-29 14:42 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,7 +176,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
@@ -189,7 +189,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');
@@ -328,9 +328,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();
     }
@@ -342,8 +342,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>';
     }
 
     /**
@@ -380,12 +380,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;
@@ -402,17 +402,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>';
 
             }
@@ -432,78 +432,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>';
 
             }
@@ -519,7 +519,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/Cli/Executable/Tar.php 1 patch

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

@@ -260,7 +260,7 @@
 block discarded – undo
         $tar->addOptionIfNotEmpty('--force-local', $this->local, false);
         $tar->addOptionIfNotEmpty('--ignore-failed-read', $this->ignoreFailedRead, false);
         $tar->addOptionIfNotEmpty('--use-compress-program', $this->compressProgram);
-        $tar->addOption('-' . (empty($this->compressProgram) ? $this->compression : '') . $create);
+        $tar->addOption('-'.(empty($this->compressProgram) ? $this->compression : '').$create);
 
         if ($this->isThrottled()) {
             $pv = new Cmd('pv');

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 "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
+            print 'You are not using the latest version of phpbu.'.PHP_EOL
+                . 'Use "phpbu --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/Backup/Cleaner/Capacity.php 1 patch

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

@@ -85,7 +85,7 @@  discard block
 block discarded – undo
         if ($this->deleteTarget) {
             $this->deleteTarget = false;
             $result->debug('target will be deleted as well');
-            $result->debug('delete ' . $target->getPathname());
+            $result->debug('delete '.$target->getPathname());
         }
         parent::simulate($target, $collector, $result);
     }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
         // should the currently created backup be deleted as well?
         if ($this->deleteTarget) {
             $file          = $target->toFile();
-            $index         = date('YmdHis', $file->getMTime()) . '-' . count($files) . '-' . $file->getPathname();
+            $index         = date('YmdHis', $file->getMTime()).'-'.count($files).'-'.$file->getPathname();
             $files[$index] = $file;
         }
         return $files;

Please login to merge, or discard this patch.

src/Backup/Source/Tar.php 1 patch

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

@@ -146,7 +146,7 @@
 block discarded – undo
         $result->debug($tar->getCmdPrintable());
 
         if (!$tar->isSuccessful() && !$this->onlyAcceptedWarnings($tar)) {
-            throw new Exception('tar failed: ' . $tar->getStdErr());
+            throw new Exception('tar failed: '.$tar->getStdErr());
         }
 
         return $this->createStatus($target);

Please login to merge, or discard this patch.

		@@ -260,7 +260,7 @@
		block discarded – undo
260	260	$tar->addOptionIfNotEmpty('--force-local', $this->local, false);
261	261	$tar->addOptionIfNotEmpty('--ignore-failed-read', $this->ignoreFailedRead, false);
262	262	$tar->addOptionIfNotEmpty('--use-compress-program', $this->compressProgram);
263		- $tar->addOption('-' . (empty($this->compressProgram) ? $this->compression : '') . $create);
	263	+ $tar->addOption('-'.(empty($this->compressProgram) ? $this->compression : '').$create);
264	264
265	265	if ($this->isThrottled()) {
266	266	$pv = new Cmd('pv');

		@@ -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 "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
	302	+ print 'You are not using the latest version of phpbu.'.PHP_EOL
	303	+ . 'Use "phpbu --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

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

		@@ -85,7 +85,7 @@ discard block
		block discarded – undo
85	85	if ($this->deleteTarget) {
86	86	$this->deleteTarget = false;
87	87	$result->debug('target will be deleted as well');
88		- $result->debug('delete ' . $target->getPathname());
	88	+ $result->debug('delete '.$target->getPathname());
89	89	}
90	90	parent::simulate($target, $collector, $result);
91	91	}
		@@ -139,7 +139,7 @@ discard block
		block discarded – undo
139	139	// should the currently created backup be deleted as well?
140	140	if ($this->deleteTarget) {
141	141	$file = $target->toFile();
142		- $index = date('YmdHis', $file->getMTime()) . '-' . count($files) . '-' . $file->getPathname();
	142	+ $index = date('YmdHis', $file->getMTime()).'-'.count($files).'-'.$file->getPathname();
143	143	$files[$index] = $file;
144	144	}
145	145	return $files;

		@@ -146,7 +146,7 @@
		block discarded – undo
146	146	$result->debug($tar->getCmdPrintable());
147	147
148	148	if (!$tar->isSuccessful() && !$this->onlyAcceptedWarnings($tar)) {
149		- throw new Exception('tar failed: ' . $tar->getStdErr());
	149	+ throw new Exception('tar failed: '.$tar->getStdErr());
150	150	}
151	151
152	152	return $this->createStatus($target);

sebastianfeldmann / phpbu

Push — master ( c70526...35413c )

Status

Category

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

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

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

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

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