Completed
Pull Request — master (#149)
by
unknown
09:50
created
src/Backup/Compressor/Directory.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
72 72
         $executable = new Tar($this->pathToCommand);
73 73
         $executable->archiveDirectory($this->path);
74 74
         $executable->archiveTo($this->getArchiveFile($target))
75
-                   ->useCompression(
76
-                       $target->shouldBeCompressed() ? $target->getCompression()->getCommand() : ''
77
-                   )
78
-                   ->removeSourceDirectory(true);
75
+                    ->useCompression(
76
+                        $target->shouldBeCompressed() ? $target->getCompression()->getCommand() : ''
77
+                    )
78
+                    ->removeSourceDirectory(true);
79 79
         return $executable;
80 80
     }
81 81
 
Please login to merge, or discard this patch.
src/Cmd.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -368,7 +368,7 @@
 block discarded – undo
368 368
   -v, --verbose          Output more verbose information.
369 369
   -V, --version          Output version information and exit.
370 370
 
371
-EOT;
371
+eot;
372 372
         if ($this->isPhar) {
373 373
             echo '  --version-check        Check whether phpbu is up to date.' . PHP_EOL;
374 374
             echo '  --self-update          Upgrade phpbu to the latest version.' . PHP_EOL;
Please login to merge, or discard this patch.
src/Backup/Sync/Rsync.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -95,14 +95,14 @@
 block discarded – undo
95 95
             );
96 96
         } else {
97 97
             $executable->fromPath($this->getRsyncLocation($target))
98
-                       ->usePassword($this->password)
99
-                       ->usePasswordFile($this->passwordFile)
100
-                       ->toHost($this->host)
101
-                       ->toPath($this->path)
102
-                       ->toUser($this->user)
103
-                       ->compressed(!$target->shouldBeCompressed())
104
-                       ->removeDeleted($this->delete)
105
-                       ->exclude($this->excludes);
98
+                        ->usePassword($this->password)
99
+                        ->usePasswordFile($this->passwordFile)
100
+                        ->toHost($this->host)
101
+                        ->toPath($this->path)
102
+                        ->toUser($this->user)
103
+                        ->compressed(!$target->shouldBeCompressed())
104
+                        ->removeDeleted($this->delete)
105
+                        ->exclude($this->excludes);
106 106
         }
107 107
         return $executable;
108 108
     }
Please login to merge, or discard this patch.
src/Backup/Source/Tar.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -183,13 +183,13 @@
 block discarded – undo
183 183
 
184 184
         $executable = new Executable\Tar($this->pathToTar);
185 185
         $executable->archiveDirectory($this->path)
186
-                   ->useCompression($this->compression)
187
-                   ->useCompressProgram($this->compressProgram)
188
-                   ->forceLocal($this->forceLocal)
189
-                   ->ignoreFailedRead($this->ignoreFailedRead)
190
-                   ->removeSourceDirectory($this->removeSourceDir)
191
-                   ->throttle($this->throttle)
192
-                   ->archiveTo($this->pathToArchive);
186
+                    ->useCompression($this->compression)
187
+                    ->useCompressProgram($this->compressProgram)
188
+                    ->forceLocal($this->forceLocal)
189
+                    ->ignoreFailedRead($this->ignoreFailedRead)
190
+                    ->removeSourceDirectory($this->removeSourceDir)
191
+                    ->throttle($this->throttle)
192
+                    ->archiveTo($this->pathToArchive);
193 193
         // add paths to exclude
194 194
         foreach ($this->excludes as $path) {
195 195
             $executable->addExclude($path);
Please login to merge, or discard this patch.
src/Backup/Crypter/OpenSSL.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -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
     }
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
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
 }
Please login to merge, or discard this patch.
src/Log/Mail.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -192,12 +192,12 @@  discard block
 block discarded – undo
192 192
             $info    = $this->getInfoHtml($result);
193 193
             $footer  = $this->getFooterHtml();
194 194
             $body    = '<html><body ' . TPL::getSnippet('sBody') . '>'
195
-                     . $header
196
-                     . $status
197
-                     . $errors
198
-                     . $info
199
-                     . $footer
200
-                     . '</body></html>';
195
+                        . $header
196
+                        . $status
197
+                        . $errors
198
+                        . $info
199
+                        . $footer
200
+                        . '</body></html>';
201 201
             $sent    = null;
202 202
             $state   = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
203 203
 
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 
341 341
         if ($username && $password) {
342 342
             $transport->setUsername($username)
343
-                      ->setPassword($password);
343
+                        ->setPassword($password);
344 344
         }
345 345
         if ($encryption) {
346 346
             $transport->setEncryption($encryption);
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
     protected function getHeaderHtml()
374 374
     {
375 375
         return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
376
-               '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
376
+                '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
377 377
     }
378 378
 
379 379
     /**
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
             Str::appendPluralS('cleanup', $this->numCleanups)
412 412
         );
413 413
         $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' .
414
-                 '<tr><td>' .
415
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
416
-                  '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
417
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
418
-                 '</td></tr>' .
414
+                    '<tr><td>' .
415
+                    '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
416
+                    '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
417
+                    '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
418
+                    '</td></tr>' .
419 419
                 '</table>';
420 420
 
421 421
         return $html;
@@ -476,65 +476,65 @@  discard block
 block discarded – undo
476 476
                     $status = 'FAILURE';
477 477
                 }
478 478
                 $html .= '<tr>' .
479
-                          '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
480
-                          sprintf('backup <em>%s</em>', $backup->getName()) .
481
-                          ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' .
482
-                          '</td>' .
483
-                         '</tr>' .
484
-                         '<tr>' .
485
-                          '<td ' . TPL::getSnippet('sRowHead') . '>&nbsp;</td>' .
486
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
487
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
488
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
489
-                         '</tr>';
479
+                            '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
480
+                            sprintf('backup <em>%s</em>', $backup->getName()) .
481
+                            ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' .
482
+                            '</td>' .
483
+                            '</tr>' .
484
+                            '<tr>' .
485
+                            '<td ' . TPL::getSnippet('sRowHead') . '>&nbsp;</td>' .
486
+                            '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
487
+                            '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
488
+                            '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
489
+                            '</tr>';
490 490
 
491 491
                 $html .= '<tr>' .
492
-                          '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
493
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
492
+                            '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
493
+                            '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
494 494
                             $backup->checkCount() . '
495 495
                            </td>' .
496
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
496
+                            '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
497 497
                             &nbsp;
498 498
                            </td>' .
499
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
499
+                            '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
500 500
                             $backup->checkCountFailed() .
501
-                          '</td>' .
502
-                         '</tr>' .
503
-                         '<tr>' .
504
-                          '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
505
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
501
+                            '</td>' .
502
+                            '</tr>' .
503
+                            '<tr>' .
504
+                            '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
505
+                            '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
506 506
                             $backup->cryptCount() .
507
-                          '</td>' .
508
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
507
+                            '</td>' .
508
+                            '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
509 509
                             $backup->cryptCountSkipped() .
510
-                          '</td>' .
511
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
510
+                            '</td>' .
511
+                            '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
512 512
                             $backup->cryptCountFailed() .
513
-                          '</td>' .
514
-                         '</tr>' .
515
-                         '<tr>' .
516
-                          '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
517
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
513
+                            '</td>' .
514
+                            '</tr>' .
515
+                            '<tr>' .
516
+                            '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
517
+                            '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
518 518
                             $backup->syncCount() . '</td>' .
519
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
519
+                            '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
520 520
                             $backup->syncCountSkipped() .
521
-                          '</td>' .
522
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
521
+                            '</td>' .
522
+                            '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
523 523
                             $backup->syncCountFailed() .
524
-                          '</td>' .
525
-                         '</tr>' .
526
-                         '<tr>' .
527
-                          '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
528
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
524
+                            '</td>' .
525
+                            '</tr>' .
526
+                            '<tr>' .
527
+                            '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
528
+                            '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
529 529
                             $backup->cleanupCount() .
530
-                          '</td>' .
531
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
530
+                            '</td>' .
531
+                            '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
532 532
                             $backup->cleanupCountSkipped() .
533
-                          '</td>' .
534
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
533
+                            '</td>' .
534
+                            '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
535 535
                             $backup->cleanupCountFailed() .
536
-                          '</td>' .
537
-                         '</tr>';
536
+                            '</td>' .
537
+                            '</tr>';
538 538
 
539 539
             }
540 540
             $html .= '</table>';
@@ -550,6 +550,6 @@  discard block
 block discarded – undo
550 550
     protected function getFooterHtml()
551 551
     {
552 552
         return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
553
-               '</td></tr></table>';
553
+                '</td></tr></table>';
554 554
     }
555 555
 }
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
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
             [
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
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;"',
Please login to merge, or discard this patch.