@@ -161,13 +161,13 @@ |
||
161 | 161 | { |
162 | 162 | $executable = new Executable\Arangodump($this->pathToArangodump); |
163 | 163 | $executable->useEndpoint($this->endpoint) |
164 | - ->credentials($this->username, $this->password) |
|
165 | - ->dumpDatabase($this->database) |
|
166 | - ->dumpCollections($this->collections) |
|
167 | - ->disableAuthentication($this->disableAuthentication) |
|
168 | - ->includeSystemCollections($this->includeSystemCollections) |
|
169 | - ->dumpData($this->dumpData) |
|
170 | - ->dumpTo($this->getDumpDir($target)); |
|
164 | + ->credentials($this->username, $this->password) |
|
165 | + ->dumpDatabase($this->database) |
|
166 | + ->dumpCollections($this->collections) |
|
167 | + ->disableAuthentication($this->disableAuthentication) |
|
168 | + ->includeSystemCollections($this->includeSystemCollections) |
|
169 | + ->dumpData($this->dumpData) |
|
170 | + ->dumpTo($this->getDumpDir($target)); |
|
171 | 171 | return $executable; |
172 | 172 | } |
173 | 173 |
@@ -72,10 +72,10 @@ |
||
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 |
@@ -30,7 +30,7 @@ |
||
30 | 30 | "softlayer/objectstorage", |
31 | 31 | "vlucas/phpdotenv" |
32 | 32 | ])) { |
33 | - continue; |
|
33 | + continue; |
|
34 | 34 | } |
35 | 35 | echo $package->name . ': ' . $package->version; |
36 | 36 | if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) { |
@@ -95,14 +95,14 @@ |
||
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 | } |
@@ -177,12 +177,12 @@ discard block |
||
177 | 177 | $info = $this->getInfoHtml($result); |
178 | 178 | $footer = $this->getFooterHtml(); |
179 | 179 | $body = '<html><body '. TPL::getSnippet('sBody') . '>' |
180 | - . $header |
|
181 | - . $status |
|
182 | - . $errors |
|
183 | - . $info |
|
184 | - . $footer |
|
185 | - . '</body></html>'; |
|
180 | + . $header |
|
181 | + . $status |
|
182 | + . $errors |
|
183 | + . $info |
|
184 | + . $footer |
|
185 | + . '</body></html>'; |
|
186 | 186 | $sent = null; |
187 | 187 | $state = $allGood ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
188 | 188 | |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | |
311 | 311 | if ($username && $password) { |
312 | 312 | $transport->setUsername($username) |
313 | - ->setPassword($password); |
|
313 | + ->setPassword($password); |
|
314 | 314 | } |
315 | 315 | if ($encryption) { |
316 | 316 | $transport->setEncryption($encryption); |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | protected function getHeaderHtml() |
344 | 344 | { |
345 | 345 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
346 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
346 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | /** |
@@ -381,11 +381,11 @@ discard block |
||
381 | 381 | Str::appendPluralS('cleanup', $this->numCleanups) |
382 | 382 | ); |
383 | 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>' . |
|
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; |
@@ -446,65 +446,65 @@ discard block |
||
446 | 446 | $status = 'FAILURE'; |
447 | 447 | } |
448 | 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 | - '</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 | + '</tr>'; |
|
460 | 460 | |
461 | 461 | $html .= '<tr>' . |
462 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
463 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
462 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
463 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
464 | 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">' . |
|
469 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
470 | 470 | $backup->checkCountFailed() . |
471 | - '</td>' . |
|
472 | - '</tr>' . |
|
473 | - '<tr>' . |
|
474 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
475 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
471 | + '</td>' . |
|
472 | + '</tr>' . |
|
473 | + '<tr>' . |
|
474 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
475 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
476 | 476 | $backup->cryptCount() . |
477 | - '</td>' . |
|
478 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
477 | + '</td>' . |
|
478 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
479 | 479 | $backup->cryptCountSkipped() . |
480 | - '</td>' . |
|
481 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
480 | + '</td>' . |
|
481 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
482 | 482 | $backup->cryptCountFailed() . |
483 | - '</td>' . |
|
484 | - '</tr>' . |
|
485 | - '<tr>' . |
|
486 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
487 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
483 | + '</td>' . |
|
484 | + '</tr>' . |
|
485 | + '<tr>' . |
|
486 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
487 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
488 | 488 | $backup->syncCount() . '</td>' . |
489 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
489 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
490 | 490 | $backup->syncCountSkipped() . |
491 | - '</td>' . |
|
492 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
491 | + '</td>' . |
|
492 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
493 | 493 | $backup->syncCountFailed() . |
494 | - '</td>' . |
|
495 | - '</tr>' . |
|
496 | - '<tr>' . |
|
497 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
498 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
494 | + '</td>' . |
|
495 | + '</tr>' . |
|
496 | + '<tr>' . |
|
497 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
498 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
499 | 499 | $backup->cleanupCount() . |
500 | - '</td>' . |
|
501 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
500 | + '</td>' . |
|
501 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
502 | 502 | $backup->cleanupCountSkipped() . |
503 | - '</td>' . |
|
504 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
503 | + '</td>' . |
|
504 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
505 | 505 | $backup->cleanupCountFailed() . |
506 | - '</td>' . |
|
507 | - '</tr>'; |
|
506 | + '</td>' . |
|
507 | + '</tr>'; |
|
508 | 508 | |
509 | 509 | } |
510 | 510 | $html .= '</table>'; |
@@ -520,6 +520,6 @@ discard block |
||
520 | 520 | protected function getFooterHtml() |
521 | 521 | { |
522 | 522 | return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
523 | - '</td></tr></table>'; |
|
523 | + '</td></tr></table>'; |
|
524 | 524 | } |
525 | 525 | } |
@@ -183,13 +183,13 @@ |
||
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); |
@@ -245,22 +245,22 @@ |
||
245 | 245 | { |
246 | 246 | $executable = new Executable\Mysqldump($this->pathToMysqldump); |
247 | 247 | $executable->credentials($this->user, $this->password) |
248 | - ->useHost($this->host) |
|
249 | - ->usePort($this->port) |
|
250 | - ->useQuickMode($this->quick) |
|
251 | - ->lockTables($this->lockTables) |
|
252 | - ->dumpBlobsHexadecimal($this->hexBlob) |
|
253 | - ->addGTIDStatement($this->gtidPurged) |
|
254 | - ->useCompression($this->compress) |
|
255 | - ->useExtendedInsert($this->extendedInsert) |
|
256 | - ->dumpTables($this->tables) |
|
257 | - ->singleTransaction($this->singleTransaction) |
|
258 | - ->dumpDatabases($this->databases) |
|
259 | - ->ignoreTables($this->ignoreTables) |
|
260 | - ->produceFilePerTable($this->filePerTable) |
|
261 | - ->dumpNoData($this->noData) |
|
262 | - ->dumpStructureOnly($this->structureOnly) |
|
263 | - ->dumpTo($this->getDumpTarget($target)); |
|
248 | + ->useHost($this->host) |
|
249 | + ->usePort($this->port) |
|
250 | + ->useQuickMode($this->quick) |
|
251 | + ->lockTables($this->lockTables) |
|
252 | + ->dumpBlobsHexadecimal($this->hexBlob) |
|
253 | + ->addGTIDStatement($this->gtidPurged) |
|
254 | + ->useCompression($this->compress) |
|
255 | + ->useExtendedInsert($this->extendedInsert) |
|
256 | + ->dumpTables($this->tables) |
|
257 | + ->singleTransaction($this->singleTransaction) |
|
258 | + ->dumpDatabases($this->databases) |
|
259 | + ->ignoreTables($this->ignoreTables) |
|
260 | + ->produceFilePerTable($this->filePerTable) |
|
261 | + ->dumpNoData($this->noData) |
|
262 | + ->dumpStructureOnly($this->structureOnly) |
|
263 | + ->dumpTo($this->getDumpTarget($target)); |
|
264 | 264 | // if compression is active and commands can be piped |
265 | 265 | if ($this->isHandlingCompression($target)) { |
266 | 266 | $executable->compressOutput($target->getCompression()); |
@@ -106,10 +106,10 @@ |
||
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 | } |