@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | { |
126 | 126 | $executable = $this->createOpenSSL($target); |
127 | 127 | $executable->encryptFile($target->getPathname()) |
128 | - ->deleteSource(!$this->keepUncrypted); |
|
128 | + ->deleteSource(!$this->keepUncrypted); |
|
129 | 129 | |
130 | 130 | return $executable; |
131 | 131 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | $executable = $this->createOpenSSL($target); |
143 | 143 | $executable->decryptFile($target->getPathname()) |
144 | - ->deleteSource(false); |
|
144 | + ->deleteSource(false); |
|
145 | 145 | |
146 | 146 | return $executable; |
147 | 147 | } |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | $executable->useSSLCert($this->certFile); |
162 | 162 | } else { |
163 | 163 | $executable->usePassword($this->password) |
164 | - ->encodeBase64(true); |
|
164 | + ->encodeBase64(true); |
|
165 | 165 | } |
166 | 166 | $executable->useAlgorithm($this->algorithm); |
167 | 167 |
@@ -39,7 +39,7 @@ |
||
39 | 39 | "vlucas/phpdotenv", |
40 | 40 | |
41 | 41 | ])) { |
42 | - continue; |
|
42 | + continue; |
|
43 | 43 | } |
44 | 44 | echo $package->name . ': ' . $package->version; |
45 | 45 | if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | { |
103 | 103 | $executable = $this->createGpg($target); |
104 | 104 | $executable->encryptFile($target->getPathname()) |
105 | - ->deleteSource(!$this->keepUncrypted); |
|
105 | + ->deleteSource(!$this->keepUncrypted); |
|
106 | 106 | |
107 | 107 | return $executable; |
108 | 108 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | { |
118 | 118 | $executable = $this->createGpg($target); |
119 | 119 | $executable->decryptFile($target->getPathname()) |
120 | - ->deleteSource(false); |
|
120 | + ->deleteSource(false); |
|
121 | 121 | |
122 | 122 | return $executable; |
123 | 123 | } |
@@ -224,7 +224,7 @@ |
||
224 | 224 | $cmd->addOptionIfNotEmpty('-C', $this->compress, false); |
225 | 225 | |
226 | 226 | if (!empty($this->sourceFilename)) { |
227 | - $cmd->addOption('--execute', 'source '.$this->sourceFilename); |
|
227 | + $cmd->addOption('--execute', 'source ' . $this->sourceFilename); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | return $process; |
@@ -65,7 +65,7 @@ |
||
65 | 65 | ksort($files); |
66 | 66 | |
67 | 67 | while ($this->isCapacityExceeded($files)) { |
68 | - $file = array_shift($files); |
|
68 | + $file = array_shift($files); |
|
69 | 69 | if ($file === null) { |
70 | 70 | break; |
71 | 71 | } |
@@ -333,26 +333,26 @@ |
||
333 | 333 | { |
334 | 334 | $executable = new Executable\Mysqldump($this->pathToMysqldump); |
335 | 335 | $executable->credentials($this->user, $this->password) |
336 | - ->useHost($this->host) |
|
337 | - ->usePort($this->port) |
|
338 | - ->useProtocol($this->protocol) |
|
339 | - ->useQuickMode($this->quick) |
|
340 | - ->lockTables($this->lockTables) |
|
341 | - ->dumpBlobsHexadecimal($this->hexBlob) |
|
342 | - ->addGTIDStatement($this->gtidPurged) |
|
343 | - ->useSslCa($this->sslCa) |
|
344 | - ->useCompression($this->compress) |
|
345 | - ->skipExtendedInsert($this->skipExtendedInsert) |
|
346 | - ->dumpTables($this->tables) |
|
347 | - ->singleTransaction($this->singleTransaction) |
|
348 | - ->dumpDatabases($this->databases) |
|
349 | - ->ignoreTables($this->ignoreTables) |
|
350 | - ->produceFilePerTable($this->filePerTable) |
|
351 | - ->dumpNoData($this->noData) |
|
352 | - ->dumpRoutines($this->routines) |
|
353 | - ->skipTriggers($this->skipTriggers) |
|
354 | - ->dumpStructureOnly($this->structureOnly) |
|
355 | - ->dumpTo($this->getDumpTarget($target)); |
|
336 | + ->useHost($this->host) |
|
337 | + ->usePort($this->port) |
|
338 | + ->useProtocol($this->protocol) |
|
339 | + ->useQuickMode($this->quick) |
|
340 | + ->lockTables($this->lockTables) |
|
341 | + ->dumpBlobsHexadecimal($this->hexBlob) |
|
342 | + ->addGTIDStatement($this->gtidPurged) |
|
343 | + ->useSslCa($this->sslCa) |
|
344 | + ->useCompression($this->compress) |
|
345 | + ->skipExtendedInsert($this->skipExtendedInsert) |
|
346 | + ->dumpTables($this->tables) |
|
347 | + ->singleTransaction($this->singleTransaction) |
|
348 | + ->dumpDatabases($this->databases) |
|
349 | + ->ignoreTables($this->ignoreTables) |
|
350 | + ->produceFilePerTable($this->filePerTable) |
|
351 | + ->dumpNoData($this->noData) |
|
352 | + ->dumpRoutines($this->routines) |
|
353 | + ->skipTriggers($this->skipTriggers) |
|
354 | + ->dumpStructureOnly($this->structureOnly) |
|
355 | + ->dumpTo($this->getDumpTarget($target)); |
|
356 | 356 | // if compression is active and commands can be piped |
357 | 357 | if ($this->isHandlingCompression($target)) { |
358 | 358 | $executable->compressOutput($target->getCompression()); |
@@ -195,12 +195,12 @@ discard block |
||
195 | 195 | $info = $this->getInfoHtml($result); |
196 | 196 | $footer = $this->getFooterHtml(); |
197 | 197 | $body = '<html><body ' . TPL::getSnippet('sBody') . '>' |
198 | - . $header |
|
199 | - . $status |
|
200 | - . $errors |
|
201 | - . $info |
|
202 | - . $footer |
|
203 | - . '</body></html>'; |
|
198 | + . $header |
|
199 | + . $status |
|
200 | + . $errors |
|
201 | + . $info |
|
202 | + . $footer |
|
203 | + . '</body></html>'; |
|
204 | 204 | $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
205 | 205 | |
206 | 206 | $this->mailer->Subject = $this->subject . ' [' . ($this->isSimulation ? 'SIMULATION' : $state) . ']'; |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | protected function getHeaderHtml() |
379 | 379 | { |
380 | 380 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
381 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
381 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
382 | 382 | } |
383 | 383 | |
384 | 384 | /** |
@@ -417,11 +417,11 @@ discard block |
||
417 | 417 | Str::appendPluralS('cleanup', $this->numCleanups) |
418 | 418 | ); |
419 | 419 | $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' . |
420 | - '<tr><td>' . |
|
421 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
422 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
423 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
424 | - '</td></tr>' . |
|
420 | + '<tr><td>' . |
|
421 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
422 | + '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
423 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
424 | + '</td></tr>' . |
|
425 | 425 | '</table>'; |
426 | 426 | |
427 | 427 | return $html; |
@@ -491,65 +491,65 @@ discard block |
||
491 | 491 | $status = 'FAILURE'; |
492 | 492 | } |
493 | 493 | $html .= '<tr>' . |
494 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
495 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
496 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
497 | - '</td>' . |
|
498 | - '</tr>' . |
|
499 | - '<tr>' . |
|
500 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
501 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
502 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
503 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
504 | - '</tr>'; |
|
494 | + '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
495 | + sprintf('backup <em>%s</em>', $backup->getName()) . |
|
496 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
497 | + '</td>' . |
|
498 | + '</tr>' . |
|
499 | + '<tr>' . |
|
500 | + '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
501 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
502 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
503 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
504 | + '</tr>'; |
|
505 | 505 | |
506 | 506 | $html .= '<tr>' . |
507 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
508 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
507 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
508 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
509 | 509 | $backup->checkCount() . ' |
510 | 510 | </td>' . |
511 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
511 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
512 | 512 | |
513 | 513 | </td>' . |
514 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
514 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
515 | 515 | $backup->checkCountFailed() . |
516 | - '</td>' . |
|
517 | - '</tr>' . |
|
518 | - '<tr>' . |
|
519 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
520 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
516 | + '</td>' . |
|
517 | + '</tr>' . |
|
518 | + '<tr>' . |
|
519 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
520 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
521 | 521 | $backup->cryptCount() . |
522 | - '</td>' . |
|
523 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
522 | + '</td>' . |
|
523 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
524 | 524 | $backup->cryptCountSkipped() . |
525 | - '</td>' . |
|
526 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
525 | + '</td>' . |
|
526 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
527 | 527 | $backup->cryptCountFailed() . |
528 | - '</td>' . |
|
529 | - '</tr>' . |
|
530 | - '<tr>' . |
|
531 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
532 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
528 | + '</td>' . |
|
529 | + '</tr>' . |
|
530 | + '<tr>' . |
|
531 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
532 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
533 | 533 | $backup->syncCount() . '</td>' . |
534 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
534 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
535 | 535 | $backup->syncCountSkipped() . |
536 | - '</td>' . |
|
537 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
536 | + '</td>' . |
|
537 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
538 | 538 | $backup->syncCountFailed() . |
539 | - '</td>' . |
|
540 | - '</tr>' . |
|
541 | - '<tr>' . |
|
542 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
543 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
539 | + '</td>' . |
|
540 | + '</tr>' . |
|
541 | + '<tr>' . |
|
542 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
543 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
544 | 544 | $backup->cleanupCount() . |
545 | - '</td>' . |
|
546 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
545 | + '</td>' . |
|
546 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
547 | 547 | $backup->cleanupCountSkipped() . |
548 | - '</td>' . |
|
549 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
548 | + '</td>' . |
|
549 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
550 | 550 | $backup->cleanupCountFailed() . |
551 | - '</td>' . |
|
552 | - '</tr>'; |
|
551 | + '</td>' . |
|
552 | + '</tr>'; |
|
553 | 553 | } |
554 | 554 | $html .= '</table>'; |
555 | 555 | |
@@ -565,6 +565,6 @@ discard block |
||
565 | 565 | protected function getFooterHtml() |
566 | 566 | { |
567 | 567 | return '<p ' . TPL::getSnippet('sStats') . '>' . Statistics::resourceUsage() . '</p>' . |
568 | - '</td></tr></table>'; |
|
568 | + '</td></tr></table>'; |
|
569 | 569 | } |
570 | 570 | } |
@@ -201,7 +201,7 @@ |
||
201 | 201 | . $info |
202 | 202 | . $footer |
203 | 203 | . '</body></html>'; |
204 | - $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
|
204 | + $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
|
205 | 205 | |
206 | 206 | $this->mailer->Subject = $this->subject . ' [' . ($this->isSimulation ? 'SIMULATION' : $state) . ']'; |
207 | 207 | $this->mailer->setFrom($this->senderMail, $this->senderName); |