@@ -180,13 +180,13 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | // make sure there is a scheme |
| 182 | 182 | if (!isset($parsed['scheme'])) { |
| 183 | - $parsed = parse_url('http://' . $host); |
|
| 183 | + $parsed = parse_url('http://'.$host); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - $url = $parsed['scheme'] . '://' . $this->getAuthUrlSnippet($user, $password) . $parsed['host']; |
|
| 186 | + $url = $parsed['scheme'].'://'.$this->getAuthUrlSnippet($user, $password).$parsed['host']; |
|
| 187 | 187 | |
| 188 | 188 | if (isset($parsed['port'])) { |
| 189 | - $url .= ':' . $parsed['port']; |
|
| 189 | + $url .= ':'.$parsed['port']; |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | if (!empty($parsed['path'])) { |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $url = $user; |
| 215 | 215 | |
| 216 | 216 | if (!empty($password)) { |
| 217 | - $url .= ':' . $password; |
|
| 217 | + $url .= ':'.$password; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | if (!empty($url)) { |
@@ -453,8 +453,8 @@ |
||
| 453 | 453 | protected function createProcess() |
| 454 | 454 | { |
| 455 | 455 | $process = new Process(); |
| 456 | - $password = $this->password ? 'PGPASSWORD=' . escapeshellarg($this->password) . ' ' : ''; |
|
| 457 | - $cmd = new Cmd($password . $this->binary); |
|
| 456 | + $password = $this->password ? 'PGPASSWORD='.escapeshellarg($this->password).' ' : ''; |
|
| 457 | + $cmd = new Cmd($password.$this->binary); |
|
| 458 | 458 | $process->addCommand($cmd); |
| 459 | 459 | |
| 460 | 460 | // always disable password prompt |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | public function getCommandLine() |
| 54 | 54 | { |
| 55 | 55 | return $this->cmd |
| 56 | - . (count($this->options) ? ' ' . implode(' ', $this->options) : '') |
|
| 57 | - . ($this->isSilent ? ' 2> /dev/null' : ''); |
|
| 56 | + . (count($this->options) ? ' '.implode(' ', $this->options) : '') |
|
| 57 | + . ($this->isSilent ? ' 2> /dev/null' : ''); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | if (is_array($argument)) { |
| 87 | 87 | $glue = ' '; |
| 88 | 88 | } |
| 89 | - $argument = $glue . $this->escapeArgument($argument); |
|
| 89 | + $argument = $glue.$this->escapeArgument($argument); |
|
| 90 | 90 | } else { |
| 91 | 91 | $argument = ''; |
| 92 | 92 | } |
| 93 | - $this->options[] = $option . $argument; |
|
| 93 | + $this->options[] = $option.$argument; |
|
| 94 | 94 | |
| 95 | 95 | return $this; |
| 96 | 96 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $path = $configuration->getIncludePaths(); |
| 55 | 55 | if (count($path)) { |
| 56 | 56 | $path = implode(PATH_SEPARATOR, $path); |
| 57 | - ini_set('include_path', $path . PATH_SEPARATOR . ini_get('include_path')); |
|
| 57 | + ini_set('include_path', $path.PATH_SEPARATOR.ini_get('include_path')); |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if (!empty($filename)) { |
| 72 | 72 | $pathToFile = stream_resolve_include_path($filename); |
| 73 | 73 | if (!$pathToFile || !is_readable($pathToFile)) { |
| 74 | - throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename)); |
|
| 74 | + throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename)); |
|
| 75 | 75 | } |
| 76 | 76 | require $pathToFile; |
| 77 | 77 | } |
@@ -57,6 +57,6 @@ |
||
| 57 | 57 | */ |
| 58 | 58 | public static function getVersionString() |
| 59 | 59 | { |
| 60 | - return 'phpbu ' . self::id(); |
|
| 60 | + return 'phpbu '.self::id(); |
|
| 61 | 61 | } |
| 62 | 62 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $ext = pathinfo($filename, PATHINFO_EXTENSION); |
| 44 | 44 | $type = isset(self::$extToLoaderMap[$ext]) ? self::$extToLoaderMap[$ext] : self::DEFAULT_LOADER; |
| 45 | - $class = '\\phpbu\\App\\Configuration\\Loader\\' . $type; |
|
| 45 | + $class = '\\phpbu\\App\\Configuration\\Loader\\'.$type; |
|
| 46 | 46 | |
| 47 | 47 | return new $class($filename); |
| 48 | 48 | } |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | $loaded = $document->loadXML($contents); |
| 382 | 382 | |
| 383 | 383 | foreach (libxml_get_errors() as $error) { |
| 384 | - $message .= "\n" . $error->message; |
|
| 384 | + $message .= "\n".$error->message; |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | libxml_use_internal_errors($internal); |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | sprintf( |
| 393 | 393 | 'Error loading file "%s".%s', |
| 394 | 394 | $filename, |
| 395 | - $message != '' ? "\n" . $message : '' |
|
| 395 | + $message != '' ? "\n".$message : '' |
|
| 396 | 396 | ) |
| 397 | 397 | ); |
| 398 | 398 | } |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | public function parseShortOption($arg, array &$options) |
| 102 | 102 | { |
| 103 | 103 | if (!isset($this->shortOptions[$arg])) { |
| 104 | - throw new Exception('unknown option: -' . $arg); |
|
| 104 | + throw new Exception('unknown option: -'.$arg); |
|
| 105 | 105 | } |
| 106 | - $options['-' . $arg] = true; |
|
| 106 | + $options['-'.$arg] = true; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
@@ -123,17 +123,17 @@ discard block |
||
| 123 | 123 | $argument = $list[1]; |
| 124 | 124 | } |
| 125 | 125 | if (count($list) > 2) { |
| 126 | - throw new Exception('invalid value for option: --' . $arg); |
|
| 126 | + throw new Exception('invalid value for option: --'.$arg); |
|
| 127 | 127 | } |
| 128 | - if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) { |
|
| 129 | - throw new Exception('unknown option: --' . $option); |
|
| 128 | + if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) { |
|
| 129 | + throw new Exception('unknown option: --'.$option); |
|
| 130 | 130 | } |
| 131 | - if ($argument === true && isset($this->longOptions[$option . '='])) { |
|
| 132 | - throw new Exception('argument required for option: --' . $option); |
|
| 131 | + if ($argument === true && isset($this->longOptions[$option.'='])) { |
|
| 132 | + throw new Exception('argument required for option: --'.$option); |
|
| 133 | 133 | } |
| 134 | 134 | if ($argument !== true && isset($this->longOptions[$option])) { |
| 135 | - throw new Exception('needless argument for option: --' . $option); |
|
| 135 | + throw new Exception('needless argument for option: --'.$option); |
|
| 136 | 136 | } |
| 137 | - $options['--' . $option] = $argument; |
|
| 137 | + $options['--'.$option] = $argument; |
|
| 138 | 138 | } |
| 139 | 139 | } |
@@ -148,8 +148,8 @@ discard block |
||
| 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,14 +176,14 @@ discard block |
||
| 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 |
| 183 | 183 | . $info |
| 184 | 184 | . $footer |
| 185 | 185 | . '</body></html>'; |
| 186 | - $sent = null; |
|
| 186 | + $sent = null; |
|
| 187 | 187 | |
| 188 | 188 | try { |
| 189 | 189 | /** @var \Swift_Message $message */ |
@@ -334,10 +334,10 @@ discard block |
||
| 334 | 334 | throw new Exception('option \'sendmail.path\' ist missing'); |
| 335 | 335 | } |
| 336 | 336 | $path = $options['sendmail.path']; |
| 337 | - $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : ''; |
|
| 337 | + $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : ''; |
|
| 338 | 338 | |
| 339 | 339 | /* @var $transport \Swift_SendmailTransport */ |
| 340 | - $transport = \Swift_SendmailTransport::newInstance($path . $options); |
|
| 340 | + $transport = \Swift_SendmailTransport::newInstance($path.$options); |
|
| 341 | 341 | |
| 342 | 342 | return $transport; |
| 343 | 343 | } |
@@ -349,8 +349,8 @@ discard block |
||
| 349 | 349 | */ |
| 350 | 350 | protected function getHeaderHtml() |
| 351 | 351 | { |
| 352 | - return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
|
| 353 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 352 | + return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'. |
|
| 353 | + '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | /** |
@@ -387,12 +387,12 @@ discard block |
||
| 387 | 387 | $this->numCleanups, |
| 388 | 388 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 389 | 389 | ); |
| 390 | - $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' . |
|
| 391 | - '<tr><td>' . |
|
| 392 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 393 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 394 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 395 | - '</td></tr>' . |
|
| 390 | + $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'. |
|
| 391 | + '<tr><td>'. |
|
| 392 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'. |
|
| 393 | + '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'. |
|
| 394 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'. |
|
| 395 | + '</td></tr>'. |
|
| 396 | 396 | '</table>'; |
| 397 | 397 | |
| 398 | 398 | return $html; |
@@ -409,17 +409,17 @@ discard block |
||
| 409 | 409 | $html = ''; |
| 410 | 410 | $errors = $result->getErrors(); |
| 411 | 411 | if (count($errors)) { |
| 412 | - $html .= '<table ' . TPL::getSnippet('sTableError') . '>'; |
|
| 412 | + $html .= '<table '.TPL::getSnippet('sTableError').'>'; |
|
| 413 | 413 | /* @var $e Exception */ |
| 414 | 414 | foreach ($errors as $e) { |
| 415 | - $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' . |
|
| 415 | + $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'. |
|
| 416 | 416 | sprintf( |
| 417 | 417 | "Exception '%s' with message '%s' in %s:%d", |
| 418 | 418 | get_class($e), |
| 419 | 419 | $e->getMessage(), |
| 420 | 420 | $e->getFile(), |
| 421 | 421 | $e->getLine() |
| 422 | - ) . |
|
| 422 | + ). |
|
| 423 | 423 | '</td></tr>'; |
| 424 | 424 | |
| 425 | 425 | } |
@@ -439,78 +439,78 @@ discard block |
||
| 439 | 439 | $html = ''; |
| 440 | 440 | $backups = $result->getBackups(); |
| 441 | 441 | if (count($backups)) { |
| 442 | - $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>'; |
|
| 442 | + $html .= '<table '.TPL::getSnippet('sTableBackup').'>'; |
|
| 443 | 443 | /** @var \phpbu\App\Result\Backup $backup */ |
| 444 | 444 | foreach ($backups as $backup) { |
| 445 | 445 | if ($backup->allOk()) { |
| 446 | 446 | $color = TPL::getSnippet('cStatusOK'); |
| 447 | 447 | $status = 'OK'; |
| 448 | - } elseif($backup->okButSkipsOrFails()) { |
|
| 448 | + } elseif ($backup->okButSkipsOrFails()) { |
|
| 449 | 449 | $color = TPL::getSnippet('cStatusWARN'); |
| 450 | 450 | $status = 'WARNING'; |
| 451 | 451 | } else { |
| 452 | 452 | $color = TPL::getSnippet('cStatusFAIL'); |
| 453 | 453 | $status = 'FAILURE'; |
| 454 | 454 | } |
| 455 | - $html .= '<tr>' . |
|
| 456 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 457 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 458 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 459 | - '</td>' . |
|
| 460 | - '</tr>' . |
|
| 461 | - '<tr>' . |
|
| 462 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 463 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 464 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 465 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 455 | + $html .= '<tr>'. |
|
| 456 | + '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'. |
|
| 457 | + sprintf('backup <em>%s</em>', $backup->getName()). |
|
| 458 | + ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'. |
|
| 459 | + '</td>'. |
|
| 460 | + '</tr>'. |
|
| 461 | + '<tr>'. |
|
| 462 | + '<td '.TPL::getSnippet('sRowHead').'> </td>'. |
|
| 463 | + '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'. |
|
| 464 | + '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'. |
|
| 465 | + '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'. |
|
| 466 | 466 | '</tr>'; |
| 467 | 467 | |
| 468 | - $html .= '<tr>' . |
|
| 469 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 470 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 471 | - $backup->checkCount() . ' |
|
| 468 | + $html .= '<tr>'. |
|
| 469 | + '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'. |
|
| 470 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 471 | + $backup->checkCount().' |
|
| 472 | 472 | </td>' . |
| 473 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 473 | + '<td '.TPL::getSnippet('sRowCheck').' align="right"> |
|
| 474 | 474 | |
| 475 | 475 | </td>' . |
| 476 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 477 | - $backup->checkCountFailed() . |
|
| 478 | - '</td>' . |
|
| 479 | - '</tr>' . |
|
| 480 | - '<tr>' . |
|
| 481 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 482 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 483 | - $backup->cryptCount() . |
|
| 484 | - '</td>' . |
|
| 485 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 486 | - $backup->cryptCountSkipped() . |
|
| 487 | - '</td>' . |
|
| 488 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 489 | - $backup->cryptCountFailed() . |
|
| 490 | - '</td>' . |
|
| 491 | - '</tr>' . |
|
| 492 | - '<tr>' . |
|
| 493 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 494 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 495 | - $backup->syncCount() . '</td>' . |
|
| 496 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 497 | - $backup->syncCountSkipped() . |
|
| 498 | - '</td>' . |
|
| 499 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 500 | - $backup->syncCountFailed() . |
|
| 501 | - '</td>' . |
|
| 502 | - '</tr>' . |
|
| 503 | - '<tr>' . |
|
| 504 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 505 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 506 | - $backup->cleanupCount() . |
|
| 507 | - '</td>' . |
|
| 508 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 509 | - $backup->cleanupCountSkipped() . |
|
| 510 | - '</td>' . |
|
| 511 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 512 | - $backup->cleanupCountFailed() . |
|
| 513 | - '</td>' . |
|
| 476 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 477 | + $backup->checkCountFailed(). |
|
| 478 | + '</td>'. |
|
| 479 | + '</tr>'. |
|
| 480 | + '<tr>'. |
|
| 481 | + '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'. |
|
| 482 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 483 | + $backup->cryptCount(). |
|
| 484 | + '</td>'. |
|
| 485 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 486 | + $backup->cryptCountSkipped(). |
|
| 487 | + '</td>'. |
|
| 488 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 489 | + $backup->cryptCountFailed(). |
|
| 490 | + '</td>'. |
|
| 491 | + '</tr>'. |
|
| 492 | + '<tr>'. |
|
| 493 | + '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'. |
|
| 494 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 495 | + $backup->syncCount().'</td>'. |
|
| 496 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 497 | + $backup->syncCountSkipped(). |
|
| 498 | + '</td>'. |
|
| 499 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 500 | + $backup->syncCountFailed(). |
|
| 501 | + '</td>'. |
|
| 502 | + '</tr>'. |
|
| 503 | + '<tr>'. |
|
| 504 | + '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'. |
|
| 505 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 506 | + $backup->cleanupCount(). |
|
| 507 | + '</td>'. |
|
| 508 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 509 | + $backup->cleanupCountSkipped(). |
|
| 510 | + '</td>'. |
|
| 511 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 512 | + $backup->cleanupCountFailed(). |
|
| 513 | + '</td>'. |
|
| 514 | 514 | '</tr>'; |
| 515 | 515 | |
| 516 | 516 | } |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | */ |
| 527 | 527 | protected function getFooterHtml() |
| 528 | 528 | { |
| 529 | - return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
|
| 529 | + return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'. |
|
| 530 | 530 | '</td></tr></table>'; |
| 531 | 531 | } |
| 532 | 532 | } |