@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | 'mongodump' => [], |
| 43 | 43 | 'mysqldump' => [ |
| 44 | 44 | '/usr/local/mysql/bin', // Mac OS X |
| 45 | - '/usr/mysql/bin', // Linux |
|
| 45 | + '/usr/mysql/bin', // Linux |
|
| 46 | 46 | ], |
| 47 | 47 | 'tar' => [], |
| 48 | 48 | ]; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | */ |
| 120 | 120 | public static function detectCmdLocationInPath(string $cmd, string $path) : string |
| 121 | 121 | { |
| 122 | - $command = $path . DIRECTORY_SEPARATOR . $cmd; |
|
| 122 | + $command = $path.DIRECTORY_SEPARATOR.$cmd; |
|
| 123 | 123 | $bin = self::isExecutable($command); |
| 124 | 124 | if (empty($bin)) { |
| 125 | 125 | throw new RuntimeException(sprintf('wrong path specified for \'%s\': %s', $cmd, $path)); |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | public static function detectCmdLocationInPaths($cmd, array $paths) : string |
| 156 | 156 | { |
| 157 | 157 | foreach ($paths as $path) { |
| 158 | - $command = $path . DIRECTORY_SEPARATOR . $cmd; |
|
| 158 | + $command = $path.DIRECTORY_SEPARATOR.$cmd; |
|
| 159 | 159 | $bin = self::isExecutable($command); |
| 160 | 160 | if (null !== $bin) { |
| 161 | 161 | return $bin; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | return $path; |
| 262 | 262 | } |
| 263 | 263 | |
| 264 | - $file = $base . DIRECTORY_SEPARATOR . $path; |
|
| 264 | + $file = $base.DIRECTORY_SEPARATOR.$path; |
|
| 265 | 265 | |
| 266 | 266 | if ($useIncludePath && !file_exists($file)) { |
| 267 | 267 | $includePathFile = stream_resolve_include_path($path); |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | |
| 295 | 295 | $styledLines = []; |
| 296 | 296 | foreach ($lines as $line) { |
| 297 | - $styledLines[] = strlen($line) ? $style . str_pad($line, $padding) . "\x1b[0m" : ''; |
|
| 297 | + $styledLines[] = strlen($line) ? $style.str_pad($line, $padding)."\x1b[0m" : ''; |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | return implode(PHP_EOL, $styledLines); |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | */ |
| 310 | 310 | public static function formatWithAsterisk(string $buffer, int $length = 75) : string |
| 311 | 311 | { |
| 312 | - return $buffer . str_repeat('*', $length - strlen($buffer)) . PHP_EOL; |
|
| 312 | + return $buffer.str_repeat('*', $length - strlen($buffer)).PHP_EOL; |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | /** |
@@ -333,10 +333,10 @@ discard block |
||
| 333 | 333 | if ('.' === $file || '..' === $file) { |
| 334 | 334 | continue; |
| 335 | 335 | } |
| 336 | - if (is_dir($dir . '/' . $file)) { |
|
| 337 | - self::removeDir($dir . '/' . $file); |
|
| 336 | + if (is_dir($dir.'/'.$file)) { |
|
| 337 | + self::removeDir($dir.'/'.$file); |
|
| 338 | 338 | } else { |
| 339 | - unlink($dir . '/' . $file); |
|
| 339 | + unlink($dir.'/'.$file); |
|
| 340 | 340 | } |
| 341 | 341 | } |
| 342 | 342 | rmdir($dir); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $result->debug($rsync->getCmd()); |
| 60 | 60 | |
| 61 | 61 | if (!$rsync->isSuccessful()) { |
| 62 | - throw new Exception('rsync failed: ' . $rsync->getStdErr()); |
|
| 62 | + throw new Exception('rsync failed: '.$rsync->getStdErr()); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | public function simulate(Target $target, Result $result) |
| 73 | 73 | { |
| 74 | 74 | $result->debug( |
| 75 | - 'sync backup with rsync' . PHP_EOL |
|
| 75 | + 'sync backup with rsync'.PHP_EOL |
|
| 76 | 76 | . $this->getExecutable($target)->getCommandPrintable() |
| 77 | 77 | ); |
| 78 | 78 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | $this->pathElementsChanging[] = $d; |
| 180 | 180 | $foundChangingElement = true; |
| 181 | 181 | } else { |
| 182 | - $this->pathNotChanging .= DIRECTORY_SEPARATOR . $d; |
|
| 182 | + $this->pathNotChanging .= DIRECTORY_SEPARATOR.$d; |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | */ |
| 272 | 272 | public function getFilename(bool $plain = false) : string |
| 273 | 273 | { |
| 274 | - return $this->filename . $this->getFilenameSuffix($plain); |
|
| 274 | + return $this->filename.$this->getFilenameSuffix($plain); |
|
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | /** |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | */ |
| 293 | 293 | public function getFilenameRaw($plain = false) : string |
| 294 | 294 | { |
| 295 | - return $this->filenameRaw . $this->getFilenameSuffix($plain); |
|
| 295 | + return $this->filenameRaw.$this->getFilenameSuffix($plain); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | /** |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | */ |
| 304 | 304 | public function getFilenameSuffix($plain = false) : string |
| 305 | 305 | { |
| 306 | - return $this->getSuffixToAppend() . ($plain ? '' : $this->getCompressionSuffix() . $this->getCrypterSuffix()); |
|
| 306 | + return $this->getSuffixToAppend().($plain ? '' : $this->getCompressionSuffix().$this->getCrypterSuffix()); |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | /** |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | */ |
| 314 | 314 | public function getSuffixToAppend() : string |
| 315 | 315 | { |
| 316 | - return count($this->fileSuffixes) ? '.' . implode('.', $this->fileSuffixes) : ''; |
|
| 316 | + return count($this->fileSuffixes) ? '.'.implode('.', $this->fileSuffixes) : ''; |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /** |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | */ |
| 324 | 324 | public function getCompressionSuffix() : string |
| 325 | 325 | { |
| 326 | - return $this->shouldBeCompressed() ? '.' . $this->compression->getSuffix() : ''; |
|
| 326 | + return $this->shouldBeCompressed() ? '.'.$this->compression->getSuffix() : ''; |
|
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | /** |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | */ |
| 334 | 334 | public function getCrypterSuffix() : string |
| 335 | 335 | { |
| 336 | - return $this->shouldBeEncrypted() ? '.' . $this->crypter->getSuffix() : ''; |
|
| 336 | + return $this->shouldBeEncrypted() ? '.'.$this->crypter->getSuffix() : ''; |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | /** |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | */ |
| 407 | 407 | public function getPathname(bool $plain = false) : string |
| 408 | 408 | { |
| 409 | - return $this->path . DIRECTORY_SEPARATOR . $this->getFilename($plain); |
|
| 409 | + return $this->path.DIRECTORY_SEPARATOR.$this->getFilename($plain); |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | /** |
@@ -64,11 +64,11 @@ |
||
| 64 | 64 | protected function findConfigurationInDir(string $path) : string |
| 65 | 65 | { |
| 66 | 66 | foreach ($this->defaultConfigNames as $file) { |
| 67 | - $configurationFile = $path . DIRECTORY_SEPARATOR . $file; |
|
| 67 | + $configurationFile = $path.DIRECTORY_SEPARATOR.$file; |
|
| 68 | 68 | if (file_exists($configurationFile)) { |
| 69 | 69 | return realpath($configurationFile); |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | - throw new Exception('Can\'t find configuration in directory \'' . $path . '\'.'); |
|
| 72 | + throw new Exception('Can\'t find configuration in directory \''.$path.'\'.'); |
|
| 73 | 73 | } |
| 74 | 74 | } |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | if (!empty($filename)) { |
| 42 | 42 | $pathToFile = stream_resolve_include_path($filename); |
| 43 | 43 | if (!$pathToFile || !is_readable($pathToFile)) { |
| 44 | - throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename)); |
|
| 44 | + throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename)); |
|
| 45 | 45 | } |
| 46 | 46 | require $pathToFile; |
| 47 | 47 | } |
@@ -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 */ |
@@ -327,9 +327,9 @@ discard block |
||
| 327 | 327 | { |
| 328 | 328 | if (isset($options['sendmail.path'])) { |
| 329 | 329 | $path = $options['sendmail.path']; |
| 330 | - $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : ''; |
|
| 330 | + $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : ''; |
|
| 331 | 331 | /* @var $transport \Swift_SendmailTransport */ |
| 332 | - return \Swift_SendmailTransport::newInstance($path . $options); |
|
| 332 | + return \Swift_SendmailTransport::newInstance($path.$options); |
|
| 333 | 333 | } |
| 334 | 334 | return \Swift_SendmailTransport::newInstance(); |
| 335 | 335 | } |
@@ -341,8 +341,8 @@ discard block |
||
| 341 | 341 | */ |
| 342 | 342 | protected function getHeaderHtml() |
| 343 | 343 | { |
| 344 | - return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
|
| 345 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 344 | + return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'. |
|
| 345 | + '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 346 | 346 | } |
| 347 | 347 | |
| 348 | 348 | /** |
@@ -379,12 +379,12 @@ discard block |
||
| 379 | 379 | $this->numCleanups, |
| 380 | 380 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 381 | 381 | ); |
| 382 | - $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' . |
|
| 383 | - '<tr><td>' . |
|
| 384 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 385 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 386 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 387 | - '</td></tr>' . |
|
| 382 | + $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'. |
|
| 383 | + '<tr><td>'. |
|
| 384 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'. |
|
| 385 | + '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'. |
|
| 386 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'. |
|
| 387 | + '</td></tr>'. |
|
| 388 | 388 | '</table>'; |
| 389 | 389 | |
| 390 | 390 | return $html; |
@@ -401,17 +401,17 @@ discard block |
||
| 401 | 401 | $html = ''; |
| 402 | 402 | $errors = $result->getErrors(); |
| 403 | 403 | if (count($errors)) { |
| 404 | - $html .= '<table ' . TPL::getSnippet('sTableError') . '>'; |
|
| 404 | + $html .= '<table '.TPL::getSnippet('sTableError').'>'; |
|
| 405 | 405 | /* @var $e Exception */ |
| 406 | 406 | foreach ($errors as $e) { |
| 407 | - $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' . |
|
| 407 | + $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'. |
|
| 408 | 408 | sprintf( |
| 409 | 409 | "Exception '%s' with message '%s' in %s:%d", |
| 410 | 410 | get_class($e), |
| 411 | 411 | $e->getMessage(), |
| 412 | 412 | $e->getFile(), |
| 413 | 413 | $e->getLine() |
| 414 | - ) . |
|
| 414 | + ). |
|
| 415 | 415 | '</td></tr>'; |
| 416 | 416 | |
| 417 | 417 | } |
@@ -431,78 +431,78 @@ discard block |
||
| 431 | 431 | $html = ''; |
| 432 | 432 | $backups = $result->getBackups(); |
| 433 | 433 | if (count($backups)) { |
| 434 | - $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>'; |
|
| 434 | + $html .= '<table '.TPL::getSnippet('sTableBackup').'>'; |
|
| 435 | 435 | /** @var \phpbu\App\Result\Backup $backup */ |
| 436 | 436 | foreach ($backups as $backup) { |
| 437 | 437 | if ($backup->allOk()) { |
| 438 | 438 | $color = TPL::getSnippet('cStatusOK'); |
| 439 | 439 | $status = 'OK'; |
| 440 | - } elseif($backup->okButSkipsOrFails()) { |
|
| 440 | + } elseif ($backup->okButSkipsOrFails()) { |
|
| 441 | 441 | $color = TPL::getSnippet('cStatusWARN'); |
| 442 | 442 | $status = 'WARNING'; |
| 443 | 443 | } else { |
| 444 | 444 | $color = TPL::getSnippet('cStatusFAIL'); |
| 445 | 445 | $status = 'FAILURE'; |
| 446 | 446 | } |
| 447 | - $html .= '<tr>' . |
|
| 448 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 449 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 450 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 451 | - '</td>' . |
|
| 452 | - '</tr>' . |
|
| 453 | - '<tr>' . |
|
| 454 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 455 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 456 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 457 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 447 | + $html .= '<tr>'. |
|
| 448 | + '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'. |
|
| 449 | + sprintf('backup <em>%s</em>', $backup->getName()). |
|
| 450 | + ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'. |
|
| 451 | + '</td>'. |
|
| 452 | + '</tr>'. |
|
| 453 | + '<tr>'. |
|
| 454 | + '<td '.TPL::getSnippet('sRowHead').'> </td>'. |
|
| 455 | + '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'. |
|
| 456 | + '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'. |
|
| 457 | + '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'. |
|
| 458 | 458 | '</tr>'; |
| 459 | 459 | |
| 460 | - $html .= '<tr>' . |
|
| 461 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 462 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 463 | - $backup->checkCount() . ' |
|
| 460 | + $html .= '<tr>'. |
|
| 461 | + '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'. |
|
| 462 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 463 | + $backup->checkCount().' |
|
| 464 | 464 | </td>' . |
| 465 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 465 | + '<td '.TPL::getSnippet('sRowCheck').' align="right"> |
|
| 466 | 466 | |
| 467 | 467 | </td>' . |
| 468 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 469 | - $backup->checkCountFailed() . |
|
| 470 | - '</td>' . |
|
| 471 | - '</tr>' . |
|
| 472 | - '<tr>' . |
|
| 473 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 474 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 475 | - $backup->cryptCount() . |
|
| 476 | - '</td>' . |
|
| 477 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 478 | - $backup->cryptCountSkipped() . |
|
| 479 | - '</td>' . |
|
| 480 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 481 | - $backup->cryptCountFailed() . |
|
| 482 | - '</td>' . |
|
| 483 | - '</tr>' . |
|
| 484 | - '<tr>' . |
|
| 485 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 486 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 487 | - $backup->syncCount() . '</td>' . |
|
| 488 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 489 | - $backup->syncCountSkipped() . |
|
| 490 | - '</td>' . |
|
| 491 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 492 | - $backup->syncCountFailed() . |
|
| 493 | - '</td>' . |
|
| 494 | - '</tr>' . |
|
| 495 | - '<tr>' . |
|
| 496 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 497 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 498 | - $backup->cleanupCount() . |
|
| 499 | - '</td>' . |
|
| 500 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 501 | - $backup->cleanupCountSkipped() . |
|
| 502 | - '</td>' . |
|
| 503 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 504 | - $backup->cleanupCountFailed() . |
|
| 505 | - '</td>' . |
|
| 468 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 469 | + $backup->checkCountFailed(). |
|
| 470 | + '</td>'. |
|
| 471 | + '</tr>'. |
|
| 472 | + '<tr>'. |
|
| 473 | + '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'. |
|
| 474 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 475 | + $backup->cryptCount(). |
|
| 476 | + '</td>'. |
|
| 477 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 478 | + $backup->cryptCountSkipped(). |
|
| 479 | + '</td>'. |
|
| 480 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 481 | + $backup->cryptCountFailed(). |
|
| 482 | + '</td>'. |
|
| 483 | + '</tr>'. |
|
| 484 | + '<tr>'. |
|
| 485 | + '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'. |
|
| 486 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 487 | + $backup->syncCount().'</td>'. |
|
| 488 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 489 | + $backup->syncCountSkipped(). |
|
| 490 | + '</td>'. |
|
| 491 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 492 | + $backup->syncCountFailed(). |
|
| 493 | + '</td>'. |
|
| 494 | + '</tr>'. |
|
| 495 | + '<tr>'. |
|
| 496 | + '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'. |
|
| 497 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 498 | + $backup->cleanupCount(). |
|
| 499 | + '</td>'. |
|
| 500 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 501 | + $backup->cleanupCountSkipped(). |
|
| 502 | + '</td>'. |
|
| 503 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 504 | + $backup->cleanupCountFailed(). |
|
| 505 | + '</td>'. |
|
| 506 | 506 | '</tr>'; |
| 507 | 507 | |
| 508 | 508 | } |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | */ |
| 519 | 519 | protected function getFooterHtml() |
| 520 | 520 | { |
| 521 | - return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
|
| 521 | + return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'. |
|
| 522 | 522 | '</td></tr></table>'; |
| 523 | 523 | } |
| 524 | 524 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $ret = self::EXIT_EXCEPTION; |
| 98 | 98 | } |
| 99 | 99 | } catch (\Exception $e) { |
| 100 | - echo $e->getMessage() . PHP_EOL; |
|
| 100 | + echo $e->getMessage().PHP_EOL; |
|
| 101 | 101 | $ret = self::EXIT_EXCEPTION; |
| 102 | 102 | } |
| 103 | 103 | |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | { |
| 238 | 238 | $value = Arr::getValue($this->arguments, $arg); |
| 239 | 239 | if (!empty($value)) { |
| 240 | - $setter = 'set' . ucfirst($arg); |
|
| 240 | + $setter = 'set'.ucfirst($arg); |
|
| 241 | 241 | $configuration->{$setter}($value); |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -252,21 +252,21 @@ discard block |
||
| 252 | 252 | // check if upgrade is necessary |
| 253 | 253 | $latestVersion = $this->getLatestVersion(); |
| 254 | 254 | if (!$this->isPharOutdated($latestVersion)) { |
| 255 | - echo 'You already have the latest version of phpbu installed.' . PHP_EOL; |
|
| 255 | + echo 'You already have the latest version of phpbu installed.'.PHP_EOL; |
|
| 256 | 256 | exit(self::EXIT_SUCCESS); |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | $remoteFilename = 'http://phar.phpbu.de/phpbu.phar'; |
| 260 | 260 | $localFilename = realpath($_SERVER['argv'][0]); |
| 261 | - $tempFilename = basename($localFilename, '.phar') . '-temp.phar'; |
|
| 261 | + $tempFilename = basename($localFilename, '.phar').'-temp.phar'; |
|
| 262 | 262 | |
| 263 | - echo 'Updating the phpbu PHAR to version ' . $latestVersion . ' ... '; |
|
| 263 | + echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... '; |
|
| 264 | 264 | |
| 265 | 265 | $old = error_reporting(0); |
| 266 | 266 | $phar = file_get_contents($remoteFilename); |
| 267 | 267 | error_reporting($old); |
| 268 | 268 | if (!$phar) { |
| 269 | - echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL; |
|
| 269 | + echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL; |
|
| 270 | 270 | exit(self::EXIT_EXCEPTION); |
| 271 | 271 | } |
| 272 | 272 | file_put_contents($tempFilename, $phar); |
@@ -282,11 +282,11 @@ discard block |
||
| 282 | 282 | } catch (Exception $e) { |
| 283 | 283 | // cleanup crappy phar |
| 284 | 284 | unlink($tempFilename); |
| 285 | - echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL; |
|
| 285 | + echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL; |
|
| 286 | 286 | exit(self::EXIT_EXCEPTION); |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | - echo 'done' . PHP_EOL; |
|
| 289 | + echo 'done'.PHP_EOL; |
|
| 290 | 290 | exit(self::EXIT_SUCCESS); |
| 291 | 291 | } |
| 292 | 292 | |
@@ -299,10 +299,10 @@ discard block |
||
| 299 | 299 | |
| 300 | 300 | $latestVersion = $this->getLatestVersion(); |
| 301 | 301 | if ($this->isPharOutdated($latestVersion)) { |
| 302 | - print 'You are not using the latest version of phpbu.' . PHP_EOL |
|
| 303 | - . 'Use "phpunit --self-update" to install phpbu ' . $latestVersion . PHP_EOL; |
|
| 302 | + print 'You are not using the latest version of phpbu.'.PHP_EOL |
|
| 303 | + . 'Use "phpunit --self-update" to install phpbu '.$latestVersion.PHP_EOL; |
|
| 304 | 304 | } else { |
| 305 | - print 'You are using the latest version of phpbu.' . PHP_EOL; |
|
| 305 | + print 'You are using the latest version of phpbu.'.PHP_EOL; |
|
| 306 | 306 | } |
| 307 | 307 | exit(self::EXIT_SUCCESS); |
| 308 | 308 | } |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | $version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu'); |
| 320 | 320 | error_reporting($old); |
| 321 | 321 | if (!$version) { |
| 322 | - echo 'Network-Error: Could not check latest version.' . PHP_EOL; |
|
| 322 | + echo 'Network-Error: Could not check latest version.'.PHP_EOL; |
|
| 323 | 323 | exit(self::EXIT_EXCEPTION); |
| 324 | 324 | } |
| 325 | 325 | return $version; |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | return; |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | - echo Version::getVersionString() . PHP_EOL . PHP_EOL; |
|
| 348 | + echo Version::getVersionString().PHP_EOL.PHP_EOL; |
|
| 349 | 349 | $this->isVersionStringPrinted = true; |
| 350 | 350 | } |
| 351 | 351 | |
@@ -370,8 +370,8 @@ discard block |
||
| 370 | 370 | |
| 371 | 371 | EOT; |
| 372 | 372 | if ($this->isPhar) { |
| 373 | - echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL; |
|
| 374 | - echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL; |
|
| 373 | + echo ' --version-check Check whether phpbu is up to date.'.PHP_EOL; |
|
| 374 | + echo ' --self-update Upgrade phpbu to the latest version.'.PHP_EOL; |
|
| 375 | 375 | } |
| 376 | 376 | } |
| 377 | 377 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | { |
| 386 | 386 | $help = $hint ? ', use "phpbu -h" for help' : ''; |
| 387 | 387 | $this->printVersionString(); |
| 388 | - echo $message . $help . PHP_EOL; |
|
| 388 | + echo $message.$help.PHP_EOL; |
|
| 389 | 389 | exit(self::EXIT_EXCEPTION); |
| 390 | 390 | } |
| 391 | 391 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | public function __construct(bool $isPhar = false) |
| 55 | 55 | { |
| 56 | 56 | if ($isPhar) { |
| 57 | - $this->longOptions['self-update'] = true; |
|
| 57 | + $this->longOptions['self-update'] = true; |
|
| 58 | 58 | $this->longOptions['version-check'] = true; |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | public function parseShortOption($arg, array &$options) |
| 103 | 103 | { |
| 104 | 104 | if (!isset($this->shortOptions[$arg])) { |
| 105 | - throw new Exception('unknown option: -' . $arg); |
|
| 105 | + throw new Exception('unknown option: -'.$arg); |
|
| 106 | 106 | } |
| 107 | - $options['-' . $arg] = true; |
|
| 107 | + $options['-'.$arg] = true; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -124,17 +124,17 @@ discard block |
||
| 124 | 124 | $argument = $list[1]; |
| 125 | 125 | } |
| 126 | 126 | if (count($list) > 2) { |
| 127 | - throw new Exception('invalid value for option: --' . $arg); |
|
| 127 | + throw new Exception('invalid value for option: --'.$arg); |
|
| 128 | 128 | } |
| 129 | - if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) { |
|
| 130 | - throw new Exception('unknown option: --' . $option); |
|
| 129 | + if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) { |
|
| 130 | + throw new Exception('unknown option: --'.$option); |
|
| 131 | 131 | } |
| 132 | - if ($argument === true && isset($this->longOptions[$option . '='])) { |
|
| 133 | - throw new Exception('argument required for option: --' . $option); |
|
| 132 | + if ($argument === true && isset($this->longOptions[$option.'='])) { |
|
| 133 | + throw new Exception('argument required for option: --'.$option); |
|
| 134 | 134 | } |
| 135 | 135 | if ($argument !== true && isset($this->longOptions[$option])) { |
| 136 | - throw new Exception('needless argument for option: --' . $option); |
|
| 136 | + throw new Exception('needless argument for option: --'.$option); |
|
| 137 | 137 | } |
| 138 | - $options['--' . $option] = $argument; |
|
| 138 | + $options['--'.$option] = $argument; |
|
| 139 | 139 | } |
| 140 | 140 | } |
@@ -9,16 +9,16 @@ |
||
| 9 | 9 | } else { |
| 10 | 10 | $branch = @exec('git rev-parse --abbrev-ref HEAD'); |
| 11 | 11 | $hash = @exec('git log -1 --format="%H"'); |
| 12 | - echo $branch . '@' . $hash; |
|
| 12 | + echo $branch.'@'.$hash; |
|
| 13 | 13 | } |
| 14 | 14 | echo PHP_EOL; |
| 15 | 15 | |
| 16 | -$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock')); |
|
| 16 | +$lock = json_decode(file_get_contents(__DIR__.'/../composer.lock')); |
|
| 17 | 17 | |
| 18 | 18 | foreach ($lock->packages as $package) { |
| 19 | - echo $package->name . ': ' . $package->version; |
|
| 19 | + echo $package->name.': '.$package->version; |
|
| 20 | 20 | if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) { |
| 21 | - echo '@' . $package->source->reference; |
|
| 21 | + echo '@'.$package->source->reference; |
|
| 22 | 22 | } |
| 23 | 23 | echo PHP_EOL; |
| 24 | 24 | } |