Inspection of "Move to Dotenv 3" - sebastianfeldmann/phpbu - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#196)

unknown

created 2019-07-30 13:23 UTC

Status

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

@@ -106,10 +106,10 @@
 block discarded – undo
             $executable->useSSLCert($this->certFile);
         } else {
             $executable->usePassword($this->password)
-                       ->encodeBase64(true);
+                        ->encodeBase64(true);
         }
         $executable->useAlgorithm($this->algorithm)
-                   ->deleteUncrypted(!$this->keepUncrypted);
+                    ->deleteUncrypted(!$this->keepUncrypted);
 
         return $executable;
     }

Please login to merge, or discard this patch.

src/Backup/Crypter/Mcrypt.php 1 patch

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

@@ -114,12 +114,12 @@
 block discarded – undo
     {
         $executable = new Executable\Mcrypt((string) $this->pathToMcrypt);
         $executable->useAlgorithm($this->algorithm)
-                   ->useKey($this->key)
-                   ->useKeyFile($this->keyFile)
-                   ->useConfig($this->config)
-                   ->useHash($this->hash)
-                   ->saveAt($target->getPathname())
-                   ->deleteUncrypted(!$this->keepUncrypted);
+                    ->useKey($this->key)
+                    ->useKeyFile($this->keyFile)
+                    ->useConfig($this->config)
+                    ->useHash($this->hash)
+                    ->saveAt($target->getPathname())
+                    ->deleteUncrypted(!$this->keepUncrypted);
         return $executable;
     }
 }

Please login to merge, or discard this patch.

src/Backup/Sync/AmazonS3v2.php 1 patch

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

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

Please login to merge, or discard this patch.

src/Log/MailTemplate.php 1 patch

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

@@ -48,39 +48,39 @@
 block discarded – undo
     {
         self::setSnippets([
             'sBody'                    => 'style="font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'background-color:#343b43; ' .
-                                                 'font-size: 15px; margin:0; ' .
-                                                 'padding:0;"',
+                                                    'background-color:#343b43; ' .
+                                                    'font-size: 15px; margin:0; ' .
+                                                    'padding:0;"',
             'sTableHeader'             => 'style="width:100%; ' .
-                                                 'font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'margin:0; color:#e6e6e6;" ' .
-                                          'align="center" cellpadding="5" cellspacing="0"',
+                                                    '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;" ' .
-                                          'align="center" cellpadding="5" cellspacing="0"',
+                                                    'background-color:#e6e6e6; ' .
+                                                    'margin:0 auto 15px; ' .
+                                                    'border:1px solid #011516;" ' .
+                                            'align="center" cellpadding="5" cellspacing="0"',
             'sTableErrorCol'           => 'style="border-top: 1px solid #f6f6f6; ' .
-                                                 'border-bottom: 1px solid #c9c9c9;"',
+                                                    'border-bottom: 1px solid #c9c9c9;"',
             'sTableContent'            => 'style="width:420px; ' .
-                                                 'font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'margin:0 auto;" ' .
-                                          'align="center" cellpadding="0" cellspacing="0"',
+                                                    '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;" ' .
-                                          'align="center" cellpadding="10" cellspacing="0"',
+                                                    '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;" ' .
-                                          'align="center" cellpadding="5" cellspacing="0" width="100%"',
+                                                    'background-color:#e6e6e6; ' .
+                                                    'margin:0 0 15px; ' .
+                                                    'border:1px solid #011516;" ' .
+                                            'align="center" cellpadding="5" cellspacing="0" width="100%"',
             'sTableBackupStatusColumn' => 'style="background-color:#%s; ' .
-                                                 'border-bottom:1px solid #747474;"',
+                                                    'border-bottom:1px solid #747474;"',
             'sTableBackupStatusText'   => 'style="float:right;"',
             'sRowHead'                 => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"',
             'sRowCheck'                => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"',

Please login to merge, or discard this patch.

src/Backup/Sync/GoogleDrive.php 1 patch

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

@@ -3,7 +3,6 @@
 block discarded – undo
 
 use Google_Client as GClient;
 use Google_Http_MediaFileUpload as GStream;
-use Google_Service_Drive as GDrive;
 use Google_Service_Drive as GDriveService;
 use Google_Service_Drive_DriveFile as GFile;
 use phpbu\App\Backup\Collector;

Please login to merge, or discard this patch.

src/Backup/Source/Tar.php 1 patch

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

@@ -194,14 +194,14 @@
 block discarded – undo
 
         $executable = new Executable\Tar($this->pathToTar);
         $executable->archiveDirectory($this->path)
-                   ->useCompression($this->compression)
-                   ->useCompressProgram($this->compressProgram)
-                   ->forceLocal($this->forceLocal)
-                   ->ignoreFailedRead($this->ignoreFailedRead)
-                   ->removeSourceDirectory($this->removeSourceDir)
-                   ->throttle($this->throttle)
-                   ->archiveTo($this->pathToArchive)
-                   ->dereference($this->dereference);
+                    ->useCompression($this->compression)
+                    ->useCompressProgram($this->compressProgram)
+                    ->forceLocal($this->forceLocal)
+                    ->ignoreFailedRead($this->ignoreFailedRead)
+                    ->removeSourceDirectory($this->removeSourceDir)
+                    ->throttle($this->throttle)
+                    ->archiveTo($this->pathToArchive)
+                    ->dereference($this->dereference);
         // add paths to exclude
         foreach ($this->excludes as $path) {
             $executable->addExclude($path);

Please login to merge, or discard this patch.

src/Log/Mail.php 2 patches

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

@@ -197,7 +197,7 @@
 block discarded – undo
                      . $info
                      . $footer
                      . '</body></html>';
-            $state   = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
+            $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
 
             $this->mailer->Subject = $this->subject . ' [' . $state . ']';
             $this->mailer->setFrom($this->senderMail, $this->senderName);

Please login to merge, or discard this patch.

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

@@ -191,12 +191,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>';
             $state   = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
 
             $this->mailer->Subject = $this->subject . ' [' . $state . ']';
@@ -375,7 +375,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>';
     }
 
     /**
@@ -414,11 +414,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;
@@ -480,65 +480,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>';
         }
@@ -554,6 +554,6 @@  discard block
 block discarded – undo
     protected function getFooterHtml()
     {
         return '<p ' . TPL::getSnippet('sStats') . '>' . Statistics::resourceUsage() . '</p>' .
-               '</td></tr></table>';
+                '</td></tr></table>';
     }
 }

Please login to merge, or discard this patch.

src/Configuration/Generator.php 1 patch

Upper-Lower-Casing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -34,7 +34,7 @@  discard block
 block discarded – undo
     </backups>
 </phpbu>
 
-EOT;
+eot;
 
     /**
      * @var string
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
   ]
 }
 
-EOT;
+eot;
 
     /**
      * Return the config file content

Please login to merge, or discard this patch.

src/Cmd.php 2 patches

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

@@ -194,7 +194,7 @@
 block discarded – undo
 
         if ($configLoader->hasValidationErrors()) {
             echo "  Warning - The configuration file did not pass validation!" . \PHP_EOL .
-                 "  The following problems have been detected:" . \PHP_EOL;
+                    "  The following problems have been detected:" . \PHP_EOL;
 
             foreach ($configLoader->getValidationErrors() as $line => $errors) {
                 echo \sprintf("\n  Line %d:\n", $line);

Please login to merge, or discard this patch.

Upper-Lower-Casing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -406,7 +406,7 @@
 block discarded – undo
   -v, --verbose            Output more verbose information.
   -V, --version            Output version information and exit.
 
-EOT;
+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;

Please login to merge, or discard this patch.

		@@ -191,12 +191,12 @@ discard block
		block discarded – undo
191	191	$info = $this->getInfoHtml($result);
192	192	$footer = $this->getFooterHtml();
193	193	$body = '<html><body ' . TPL::getSnippet('sBody') . '>'
194		- . $header
195		- . $status
196		- . $errors
197		- . $info
198		- . $footer
199		- . '</body></html>';
	194	+ . $header
	195	+ . $status
	196	+ . $errors
	197	+ . $info
	198	+ . $footer
	199	+ . '</body></html>';
200	200	$state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
201	201
202	202	$this->mailer->Subject = $this->subject . ' [' . $state . ']';
		@@ -375,7 +375,7 @@ discard block
		block discarded – undo
375	375	protected function getHeaderHtml()
376	376	{
377	377	return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
378		- '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
	378	+ '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
379	379	}
380	380
381	381	/**
		@@ -414,11 +414,11 @@ discard block
		block discarded – undo
414	414	Str::appendPluralS('cleanup', $this->numCleanups)
415	415	);
416	416	$html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' .
417		- '<tr><td>' .
418		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
419		- '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
420		- '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
421		- '</td></tr>' .
	417	+ '<tr><td>' .
	418	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
	419	+ '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
	420	+ '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
	421	+ '</td></tr>' .
422	422	'</table>';
423	423
424	424	return $html;
		@@ -480,65 +480,65 @@ discard block
		block discarded – undo
480	480	$status = 'FAILURE';
481	481	}
482	482	$html .= '<tr>' .
483		- '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
484		- sprintf('backup <em>%s</em>', $backup->getName()) .
485		- ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' .
486		- '</td>' .
487		- '</tr>' .
488		- '<tr>' .
489		- '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
490		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
491		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
492		- '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
493		- '</tr>';
	483	+ '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
	484	+ sprintf('backup <em>%s</em>', $backup->getName()) .
	485	+ ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' .
	486	+ '</td>' .
	487	+ '</tr>' .
	488	+ '<tr>' .
	489	+ '<td ' . TPL::getSnippet('sRowHead') . '> </td>' .
	490	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
	491	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
	492	+ '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
	493	+ '</tr>';
494	494
495	495	$html .= '<tr>' .
496		- '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
497		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	496	+ '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
	497	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
498	498	$backup->checkCount() . '
499	499	</td>' .
500		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
	500	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
501	501
502	502	</td>' .
503		- '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
	503	+ '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
504	504	$backup->checkCountFailed() .
505		- '</td>' .
506		- '</tr>' .
507		- '<tr>' .
508		- '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
509		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	505	+ '</td>' .
	506	+ '</tr>' .
	507	+ '<tr>' .
	508	+ '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
	509	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
510	510	$backup->cryptCount() .
511		- '</td>' .
512		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	511	+ '</td>' .
	512	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
513	513	$backup->cryptCountSkipped() .
514		- '</td>' .
515		- '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
	514	+ '</td>' .
	515	+ '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
516	516	$backup->cryptCountFailed() .
517		- '</td>' .
518		- '</tr>' .
519		- '<tr>' .
520		- '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
521		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	517	+ '</td>' .
	518	+ '</tr>' .
	519	+ '<tr>' .
	520	+ '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
	521	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
522	522	$backup->syncCount() . '</td>' .
523		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	523	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
524	524	$backup->syncCountSkipped() .
525		- '</td>' .
526		- '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
	525	+ '</td>' .
	526	+ '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
527	527	$backup->syncCountFailed() .
528		- '</td>' .
529		- '</tr>' .
530		- '<tr>' .
531		- '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
532		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	528	+ '</td>' .
	529	+ '</tr>' .
	530	+ '<tr>' .
	531	+ '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
	532	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
533	533	$backup->cleanupCount() .
534		- '</td>' .
535		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	534	+ '</td>' .
	535	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
536	536	$backup->cleanupCountSkipped() .
537		- '</td>' .
538		- '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
	537	+ '</td>' .
	538	+ '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
539	539	$backup->cleanupCountFailed() .
540		- '</td>' .
541		- '</tr>';
	540	+ '</td>' .
	541	+ '</tr>';
542	542	}
543	543	$html .= '</table>';
544	544	}
		@@ -554,6 +554,6 @@ discard block
		block discarded – undo
554	554	protected function getFooterHtml()
555	555	{
556	556	return '<p ' . TPL::getSnippet('sStats') . '>' . Statistics::resourceUsage() . '</p>' .
557		- '</td></tr></table>';
	557	+ '</td></tr></table>';
558	558	}
559	559	}

		@@ -406,7 +406,7 @@
		block discarded – undo
406	406	-v, --verbose Output more verbose information.
407	407	-V, --version Output version information and exit.
408	408
409		-EOT;
	409	+eot;
410	410	if ($this->isPhar) {
411	411	echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL;
412	412	echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL;

		@@ -106,10 +106,10 @@
		block discarded – undo
106	106	$executable->useSSLCert($this->certFile);
107	107	} else {
108	108	$executable->usePassword($this->password)
109		- ->encodeBase64(true);
	109	+ ->encodeBase64(true);
110	110	}
111	111	$executable->useAlgorithm($this->algorithm)
112		- ->deleteUncrypted(!$this->keepUncrypted);
	112	+ ->deleteUncrypted(!$this->keepUncrypted);
113	113
114	114	return $executable;
115	115	}

		@@ -114,12 +114,12 @@
		block discarded – undo
114	114	{
115	115	$executable = new Executable\Mcrypt((string) $this->pathToMcrypt);
116	116	$executable->useAlgorithm($this->algorithm)
117		- ->useKey($this->key)
118		- ->useKeyFile($this->keyFile)
119		- ->useConfig($this->config)
120		- ->useHash($this->hash)
121		- ->saveAt($target->getPathname())
122		- ->deleteUncrypted(!$this->keepUncrypted);
	117	+ ->useKey($this->key)
	118	+ ->useKeyFile($this->keyFile)
	119	+ ->useConfig($this->config)
	120	+ ->useHash($this->hash)
	121	+ ->saveAt($target->getPathname())
	122	+ ->deleteUncrypted(!$this->keepUncrypted);
123	123	return $executable;
124	124	}
125	125	}

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

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

		@@ -3,7 +3,6 @@
		block discarded – undo
3	3
4	4	use Google_Client as GClient;
5	5	use Google_Http_MediaFileUpload as GStream;
6		-use Google_Service_Drive as GDrive;
7	6	use Google_Service_Drive as GDriveService;
8	7	use Google_Service_Drive_DriveFile as GFile;
9	8	use phpbu\App\Backup\Collector;

		@@ -194,14 +194,14 @@
		block discarded – undo
194	194
195	195	$executable = new Executable\Tar($this->pathToTar);
196	196	$executable->archiveDirectory($this->path)
197		- ->useCompression($this->compression)
198		- ->useCompressProgram($this->compressProgram)
199		- ->forceLocal($this->forceLocal)
200		- ->ignoreFailedRead($this->ignoreFailedRead)
201		- ->removeSourceDirectory($this->removeSourceDir)
202		- ->throttle($this->throttle)
203		- ->archiveTo($this->pathToArchive)
204		- ->dereference($this->dereference);
	197	+ ->useCompression($this->compression)
	198	+ ->useCompressProgram($this->compressProgram)
	199	+ ->forceLocal($this->forceLocal)
	200	+ ->ignoreFailedRead($this->ignoreFailedRead)
	201	+ ->removeSourceDirectory($this->removeSourceDir)
	202	+ ->throttle($this->throttle)
	203	+ ->archiveTo($this->pathToArchive)
	204	+ ->dereference($this->dereference);
205	205	// add paths to exclude
206	206	foreach ($this->excludes as $path) {
207	207	$executable->addExclude($path);

		@@ -197,7 +197,7 @@
		block discarded – undo
197	197	. $info
198	198	. $footer
199	199	. '</body></html>';
200		- $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
	200	+ $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
201	201
202	202	$this->mailer->Subject = $this->subject . ' [' . $state . ']';
203	203	$this->mailer->setFrom($this->senderMail, $this->senderName);

		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	</backups>
35	35	</phpbu>
36	36
37		-EOT;
	37	+eot;
38	38
39	39	/**
40	40	* @var string
		@@ -64,7 +64,7 @@ discard block
		block discarded – undo
64	64	]
65	65	}
66	66
67		-EOT;
	67	+eot;
68	68
69	69	/**
70	70	* Return the config file content

		@@ -194,7 +194,7 @@
		block discarded – undo
194	194
195	195	if ($configLoader->hasValidationErrors()) {
196	196	echo " Warning - The configuration file did not pass validation!" . \PHP_EOL .
197		- " The following problems have been detected:" . \PHP_EOL;
	197	+ " The following problems have been detected:" . \PHP_EOL;
198	198
199	199	foreach ($configLoader->getValidationErrors() as $line => $errors) {
200	200	echo \sprintf("\n Line %d:\n", $line);

sebastianfeldmann / phpbu

Pull Request — master (#196)

Status

Category

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

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

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

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

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

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

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

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

Upper-Lower-Casing +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Upper-Lower-Casing +1 added lines, -1 removed lines patch added patch discarded remove patch