@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | $configuration = $event->getConfiguration(); |
| 161 | 161 | if ($this->verbose) { |
| 162 | 162 | $this->write( |
| 163 | - 'Runtime: ' . $this->runtime->getNameWithVersion() . PHP_EOL . |
|
| 164 | - 'Configuration: ' . $configuration->getFilename() . PHP_EOL . |
|
| 163 | + 'Runtime: '.$this->runtime->getNameWithVersion().PHP_EOL. |
|
| 164 | + 'Configuration: '.$configuration->getFilename().PHP_EOL. |
|
| 165 | 165 | PHP_EOL |
| 166 | 166 | ); |
| 167 | 167 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | $this->numBackups++; |
| 178 | 178 | if ($this->debug) { |
| 179 | 179 | $backup = $event->getConfiguration(); |
| 180 | - $this->writeWithAsterisk('backup: [' . $backup->getSource()->type . '] '); |
|
| 180 | + $this->writeWithAsterisk('backup: ['.$backup->getSource()->type.'] '); |
|
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | 183 | |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | public function onBackupFailed(Event\Backup\Failed $event) |
| 190 | 190 | { |
| 191 | 191 | if ($this->debug) { |
| 192 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
| 192 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | public function onBackupEnd(Event\Backup\End $event) |
| 202 | 202 | { |
| 203 | 203 | if ($this->debug) { |
| 204 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
| 204 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | 207 | |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | $this->numChecks++; |
| 216 | 216 | if ($this->debug) { |
| 217 | 217 | $check = $event->getConfiguration(); |
| 218 | - $this->writeWithAsterisk('check: [' . $check->type . '] '); |
|
| 219 | - $this->write('checking: [' . $check->value . '] '); |
|
| 218 | + $this->writeWithAsterisk('check: ['.$check->type.'] '); |
|
| 219 | + $this->write('checking: ['.$check->value.'] '); |
|
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | public function onCheckFailed(Event\Check\Failed $event) |
| 229 | 229 | { |
| 230 | 230 | if ($this->debug) { |
| 231 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
| 231 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | public function onCheckEnd(Event\Check\End $event) |
| 241 | 241 | { |
| 242 | 242 | if ($this->debug) { |
| 243 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
| 243 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | $this->numCrypts++; |
| 255 | 255 | if ($this->debug) { |
| 256 | 256 | $crypt = $event->getConfiguration(); |
| 257 | - $this->writeWithAsterisk('crypt: [' . $crypt->type . '] '); |
|
| 257 | + $this->writeWithAsterisk('crypt: ['.$crypt->type.'] '); |
|
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | public function onCryptSkipped(Event\Crypt\Skipped $event) |
| 267 | 267 | { |
| 268 | 268 | if ($this->debug) { |
| 269 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
| 269 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
| 270 | 270 | } |
| 271 | 271 | } |
| 272 | 272 | |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | public function onCryptFailed(Event\Crypt\Failed $event) |
| 279 | 279 | { |
| 280 | 280 | if ($this->debug) { |
| 281 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
| 281 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
| 282 | 282 | } |
| 283 | 283 | } |
| 284 | 284 | |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | public function onCryptEnd(Event\Crypt\End $event) |
| 291 | 291 | { |
| 292 | 292 | if ($this->debug) { |
| 293 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
| 293 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | 296 | |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | $this->numSyncs++; |
| 305 | 305 | if ($this->debug) { |
| 306 | 306 | $sync = $event->getConfiguration(); |
| 307 | - $this->writeWithAsterisk('sync: [' . $sync->type . '] '); |
|
| 307 | + $this->writeWithAsterisk('sync: ['.$sync->type.'] '); |
|
| 308 | 308 | } |
| 309 | 309 | } |
| 310 | 310 | |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | public function onSyncSkipped(Event\Sync\Skipped $event) |
| 317 | 317 | { |
| 318 | 318 | if ($this->debug) { |
| 319 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
| 319 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | public function onSyncFailed(Event\Sync\Failed $event) |
| 329 | 329 | { |
| 330 | 330 | if ($this->debug) { |
| 331 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
| 331 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
| 332 | 332 | } |
| 333 | 333 | } |
| 334 | 334 | |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | public function onSyncEnd(Event\Sync\End $event) |
| 341 | 341 | { |
| 342 | 342 | if ($this->debug) { |
| 343 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
| 343 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | $this->numCleanups++; |
| 355 | 355 | if ($this->debug) { |
| 356 | 356 | $cleanup = $event->getConfiguration(); |
| 357 | - $this->writeWithAsterisk('cleanup: [' . $cleanup->type . '] '); |
|
| 357 | + $this->writeWithAsterisk('cleanup: ['.$cleanup->type.'] '); |
|
| 358 | 358 | } |
| 359 | 359 | } |
| 360 | 360 | |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | public function onCleanupSkipped(Event\Cleanup\Skipped $event) |
| 367 | 367 | { |
| 368 | 368 | if ($this->debug) { |
| 369 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
| 369 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
| 370 | 370 | } |
| 371 | 371 | } |
| 372 | 372 | |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | public function onCleanupFailed(Event\Cleanup\Failed $event) |
| 379 | 379 | { |
| 380 | 380 | if ($this->debug) { |
| 381 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
| 381 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
| 382 | 382 | } |
| 383 | 383 | } |
| 384 | 384 | |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | public function onCleanupEnd(Event\Cleanup\End $event) |
| 391 | 391 | { |
| 392 | 392 | if ($this->debug) { |
| 393 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
| 393 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | public function onDebug(Event\Debug $event) |
| 403 | 403 | { |
| 404 | 404 | if ($this->debug) { |
| 405 | - $this->write($event->getMessage() . PHP_EOL); |
|
| 405 | + $this->write($event->getMessage().PHP_EOL); |
|
| 406 | 406 | } |
| 407 | 407 | } |
| 408 | 408 | |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | */ |
| 441 | 441 | protected function printHeader() |
| 442 | 442 | { |
| 443 | - $this->write(PHP_Timer::resourceUsage() . PHP_EOL . PHP_EOL); |
|
| 443 | + $this->write(PHP_Timer::resourceUsage().PHP_EOL.PHP_EOL); |
|
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | /** |
@@ -500,13 +500,13 @@ discard block |
||
| 500 | 500 | $clSkipped = str_pad($backup->cleanupCountSkipped(), 7, ' ', STR_PAD_LEFT); |
| 501 | 501 | $clFailed = str_pad($backup->cleanupCountFailed(), 6, ' ', STR_PAD_LEFT); |
| 502 | 502 | |
| 503 | - $out = PHP_EOL . ' | executed | skipped | failed |' . PHP_EOL |
|
| 504 | - . '----------+----------+---------+--------+' . PHP_EOL |
|
| 505 | - . ' checks | ' . $chExecuted . ' | | ' . $chFailed . ' |' . PHP_EOL |
|
| 506 | - . ' crypts | ' . $crExecuted . ' | ' . $crSkipped . ' | ' . $crFailed . ' |' . PHP_EOL |
|
| 507 | - . ' syncs | ' . $syExecuted . ' | ' . $sySkipped . ' | ' . $syFailed . ' |' . PHP_EOL |
|
| 508 | - . ' cleanups | ' . $clExecuted . ' | ' . $clSkipped . ' | ' . $clFailed . ' |' . PHP_EOL |
|
| 509 | - . '----------+----------+---------+--------+' . PHP_EOL . PHP_EOL; |
|
| 503 | + $out = PHP_EOL.' | executed | skipped | failed |'.PHP_EOL |
|
| 504 | + . '----------+----------+---------+--------+'.PHP_EOL |
|
| 505 | + . ' checks | '.$chExecuted.' | | '.$chFailed.' |'.PHP_EOL |
|
| 506 | + . ' crypts | '.$crExecuted.' | '.$crSkipped.' | '.$crFailed.' |'.PHP_EOL |
|
| 507 | + . ' syncs | '.$syExecuted.' | '.$sySkipped.' | '.$syFailed.' |'.PHP_EOL |
|
| 508 | + . ' cleanups | '.$clExecuted.' | '.$clSkipped.' | '.$clFailed.' |'.PHP_EOL |
|
| 509 | + . '----------+----------+---------+--------+'.PHP_EOL.PHP_EOL; |
|
| 510 | 510 | |
| 511 | 511 | $this->write($out); |
| 512 | 512 | } |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | $this->writeWithColor( |
| 528 | 528 | 'fg-green', |
| 529 | 529 | sprintf( |
| 530 | - 'OK (%d %s, %d %s, %d %s, %d %s, %d %s)' . PHP_EOL, |
|
| 530 | + 'OK (%d %s, %d %s, %d %s, %d %s, %d %s)'.PHP_EOL, |
|
| 531 | 531 | count($result->getBackups()), |
| 532 | 532 | Util\Str::appendPluralS('backup', count($result->getBackups())), |
| 533 | 533 | $this->numChecks, |
@@ -544,8 +544,8 @@ discard block |
||
| 544 | 544 | $this->writeWithColor( |
| 545 | 545 | 'fg-yellow', |
| 546 | 546 | sprintf( |
| 547 | - "WARNING, skipped|failed Crypts, Syncs or Cleanups!" . PHP_EOL . |
|
| 548 | - 'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d ' . PHP_EOL, |
|
| 547 | + "WARNING, skipped|failed Crypts, Syncs or Cleanups!".PHP_EOL. |
|
| 548 | + 'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d '.PHP_EOL, |
|
| 549 | 549 | count($result->getBackups()), |
| 550 | 550 | $result->cryptsSkippedCount(), |
| 551 | 551 | $result->cryptsFailedCount(), |
@@ -559,12 +559,12 @@ discard block |
||
| 559 | 559 | $this->writeWithColor( |
| 560 | 560 | 'fg-red', |
| 561 | 561 | sprintf( |
| 562 | - "FAILURE!" . PHP_EOL . |
|
| 562 | + "FAILURE!".PHP_EOL. |
|
| 563 | 563 | 'Backups: %d, ' |
| 564 | 564 | . 'failed Checks: %d, ' |
| 565 | 565 | . 'failed Crypts: %d, ' |
| 566 | 566 | . 'failed Syncs: %d, ' |
| 567 | - . 'failed Cleanups: %d.' . PHP_EOL, |
|
| 567 | + . 'failed Cleanups: %d.'.PHP_EOL, |
|
| 568 | 568 | count($result->getBackups()), |
| 569 | 569 | $result->checksFailedCount(), |
| 570 | 570 | $result->cryptsFailedCount(), |
@@ -587,7 +587,7 @@ discard block |
||
| 587 | 587 | if ($this->colors) { |
| 588 | 588 | $buffer = Util\Cli::formatWithColor($color, $buffer); |
| 589 | 589 | } |
| 590 | - $this->write($buffer . PHP_EOL); |
|
| 590 | + $this->write($buffer.PHP_EOL); |
|
| 591 | 591 | } |
| 592 | 592 | |
| 593 | 593 | /** |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | */ |
| 211 | 211 | public static function withTrailingSlash($string) |
| 212 | 212 | { |
| 213 | - return $string . (self::hasTrailingSlash($string) ? '' : '/'); |
|
| 213 | + return $string.(self::hasTrailingSlash($string) ? '' : '/'); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | */ |
| 244 | 244 | public static function withLeadingSlash($string) |
| 245 | 245 | { |
| 246 | - return (self::hasLeadingSlash($string) ? '' : '/') . $string; |
|
| 246 | + return (self::hasLeadingSlash($string) ? '' : '/').$string; |
|
| 247 | 247 | } |
| 248 | 248 | |
| 249 | 249 | /** |
@@ -266,6 +266,6 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | public static function appendPluralS($subject, $amount) |
| 268 | 268 | { |
| 269 | - return $subject . ($amount == 1 ? '' : (substr($subject, -1) == 's' ? '\'s' : 's')); |
|
| 269 | + return $subject.($amount == 1 ? '' : (substr($subject, -1) == 's' ? '\'s' : 's')); |
|
| 270 | 270 | } |
| 271 | 271 | } |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | $this->container = $container; |
| 36 | 36 | $this->filename = basename($object->name); |
| 37 | 37 | $this->pathname = $object->name; |
| 38 | - $this->size = (int)$object->contentLength; |
|
| 38 | + $this->size = (int) $object->contentLength; |
|
| 39 | 39 | $this->lastModified = $object->lastModified->getTimestamp(); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | { |
| 145 | 145 | $s3->registerStreamWrapper(); |
| 146 | 146 | $source = $this->getFileHandle($target->getPathname(), 'r'); |
| 147 | - $stream = $this->getFileHandle('s3://' . $this->bucket . '/' . $this->getUploadPath($target), 'w'); |
|
| 147 | + $stream = $this->getFileHandle('s3://'.$this->bucket.'/'.$this->getUploadPath($target), 'w'); |
|
| 148 | 148 | while (!feof($source)) { |
| 149 | 149 | fwrite($stream, fread($source, 4096)); |
| 150 | 150 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | { |
| 180 | 180 | $handle = fopen($path, $mode); |
| 181 | 181 | if (!is_resource($handle)) { |
| 182 | - throw new Exception('fopen failed: could not open stream ' . $path); |
|
| 182 | + throw new Exception('fopen failed: could not open stream '.$path); |
|
| 183 | 183 | } |
| 184 | 184 | return $handle; |
| 185 | 185 | } |
@@ -163,8 +163,8 @@ discard block |
||
| 163 | 163 | $server = gethostname(); |
| 164 | 164 | $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false); |
| 165 | 165 | $this->sendSimulating = Str::toBoolean(Arr::getValue($options, 'sendOnSimulation'), true); |
| 166 | - $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server); |
|
| 167 | - $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server); |
|
| 166 | + $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server); |
|
| 167 | + $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server); |
|
| 168 | 168 | $this->senderName = Arr::getValue($options, 'sender.name'); |
| 169 | 169 | $this->transportType = Arr::getValue($options, 'transport', 'mail'); |
| 170 | 170 | $this->recipients = array_map('trim', explode(';', $mails)); |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | */ |
| 184 | 184 | public function onPhpbuEnd(Event\App\End $event) |
| 185 | 185 | { |
| 186 | - $result = $event->getResult(); |
|
| 186 | + $result = $event->getResult(); |
|
| 187 | 187 | |
| 188 | 188 | if ($this->shouldMailBeSend($result)) { |
| 189 | 189 | $header = $this->getHeaderHtml(); |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $errors = $this->getErrorHtml($result); |
| 192 | 192 | $info = $this->getInfoHtml($result); |
| 193 | 193 | $footer = $this->getFooterHtml(); |
| 194 | - $body = '<html><body '. TPL::getSnippet('sBody') . '>' |
|
| 194 | + $body = '<html><body '.TPL::getSnippet('sBody').'>' |
|
| 195 | 195 | . $header |
| 196 | 196 | . $status |
| 197 | 197 | . $errors |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | /** @var \Swift_Message $message */ |
| 206 | 206 | $message = new Swift_Message(); |
| 207 | - $message->setSubject($this->subject . ' [' . $state . ']') |
|
| 207 | + $message->setSubject($this->subject.' ['.$state.']') |
|
| 208 | 208 | ->setFrom($this->senderMail, $this->senderName) |
| 209 | 209 | ->setTo($this->recipients) |
| 210 | 210 | ->setBody($body, 'text/html'); |
@@ -358,9 +358,9 @@ discard block |
||
| 358 | 358 | { |
| 359 | 359 | if (isset($options['sendmail.path'])) { |
| 360 | 360 | $path = $options['sendmail.path']; |
| 361 | - $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : ''; |
|
| 361 | + $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : ''; |
|
| 362 | 362 | /* @var $transport \Swift_SendmailTransport */ |
| 363 | - return new \Swift_SendmailTransport($path . $options); |
|
| 363 | + return new \Swift_SendmailTransport($path.$options); |
|
| 364 | 364 | } |
| 365 | 365 | return new \Swift_SendmailTransport(); |
| 366 | 366 | } |
@@ -372,8 +372,8 @@ discard block |
||
| 372 | 372 | */ |
| 373 | 373 | protected function getHeaderHtml() |
| 374 | 374 | { |
| 375 | - return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
|
| 376 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 375 | + return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'. |
|
| 376 | + '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | /** |
@@ -410,12 +410,12 @@ discard block |
||
| 410 | 410 | $this->numCleanups, |
| 411 | 411 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 412 | 412 | ); |
| 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>' . |
|
| 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>'. |
|
| 419 | 419 | '</table>'; |
| 420 | 420 | |
| 421 | 421 | return $html; |
@@ -432,17 +432,17 @@ discard block |
||
| 432 | 432 | $html = ''; |
| 433 | 433 | $errors = $result->getErrors(); |
| 434 | 434 | if (count($errors)) { |
| 435 | - $html .= '<table ' . TPL::getSnippet('sTableError') . '>'; |
|
| 435 | + $html .= '<table '.TPL::getSnippet('sTableError').'>'; |
|
| 436 | 436 | /* @var $e Exception */ |
| 437 | 437 | foreach ($errors as $e) { |
| 438 | - $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' . |
|
| 438 | + $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'. |
|
| 439 | 439 | sprintf( |
| 440 | 440 | "Exception '%s' with message '%s' in %s:%d", |
| 441 | 441 | get_class($e), |
| 442 | 442 | $e->getMessage(), |
| 443 | 443 | $e->getFile(), |
| 444 | 444 | $e->getLine() |
| 445 | - ) . |
|
| 445 | + ). |
|
| 446 | 446 | '</td></tr>'; |
| 447 | 447 | |
| 448 | 448 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | $html = ''; |
| 463 | 463 | $backups = $result->getBackups(); |
| 464 | 464 | if (count($backups)) { |
| 465 | - $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>'; |
|
| 465 | + $html .= '<table '.TPL::getSnippet('sTableBackup').'>'; |
|
| 466 | 466 | /** @var \phpbu\App\Result\Backup $backup */ |
| 467 | 467 | foreach ($backups as $backup) { |
| 468 | 468 | if ($backup->allOk()) { |
@@ -475,65 +475,65 @@ discard block |
||
| 475 | 475 | $color = TPL::getSnippet('cStatusFAIL'); |
| 476 | 476 | $status = 'FAILURE'; |
| 477 | 477 | } |
| 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') . '> </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>' . |
|
| 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').'> </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 | 489 | '</tr>'; |
| 490 | 490 | |
| 491 | - $html .= '<tr>' . |
|
| 492 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 493 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 494 | - $backup->checkCount() . ' |
|
| 491 | + $html .= '<tr>'. |
|
| 492 | + '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'. |
|
| 493 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 494 | + $backup->checkCount().' |
|
| 495 | 495 | </td>' . |
| 496 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 496 | + '<td '.TPL::getSnippet('sRowCheck').' align="right"> |
|
| 497 | 497 | |
| 498 | 498 | </td>' . |
| 499 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 500 | - $backup->checkCountFailed() . |
|
| 501 | - '</td>' . |
|
| 502 | - '</tr>' . |
|
| 503 | - '<tr>' . |
|
| 504 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 505 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 506 | - $backup->cryptCount() . |
|
| 507 | - '</td>' . |
|
| 508 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 509 | - $backup->cryptCountSkipped() . |
|
| 510 | - '</td>' . |
|
| 511 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 512 | - $backup->cryptCountFailed() . |
|
| 513 | - '</td>' . |
|
| 514 | - '</tr>' . |
|
| 515 | - '<tr>' . |
|
| 516 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 517 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 518 | - $backup->syncCount() . '</td>' . |
|
| 519 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 520 | - $backup->syncCountSkipped() . |
|
| 521 | - '</td>' . |
|
| 522 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 523 | - $backup->syncCountFailed() . |
|
| 524 | - '</td>' . |
|
| 525 | - '</tr>' . |
|
| 526 | - '<tr>' . |
|
| 527 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 528 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 529 | - $backup->cleanupCount() . |
|
| 530 | - '</td>' . |
|
| 531 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 532 | - $backup->cleanupCountSkipped() . |
|
| 533 | - '</td>' . |
|
| 534 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 535 | - $backup->cleanupCountFailed() . |
|
| 536 | - '</td>' . |
|
| 499 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 500 | + $backup->checkCountFailed(). |
|
| 501 | + '</td>'. |
|
| 502 | + '</tr>'. |
|
| 503 | + '<tr>'. |
|
| 504 | + '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'. |
|
| 505 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 506 | + $backup->cryptCount(). |
|
| 507 | + '</td>'. |
|
| 508 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 509 | + $backup->cryptCountSkipped(). |
|
| 510 | + '</td>'. |
|
| 511 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 512 | + $backup->cryptCountFailed(). |
|
| 513 | + '</td>'. |
|
| 514 | + '</tr>'. |
|
| 515 | + '<tr>'. |
|
| 516 | + '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'. |
|
| 517 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 518 | + $backup->syncCount().'</td>'. |
|
| 519 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 520 | + $backup->syncCountSkipped(). |
|
| 521 | + '</td>'. |
|
| 522 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 523 | + $backup->syncCountFailed(). |
|
| 524 | + '</td>'. |
|
| 525 | + '</tr>'. |
|
| 526 | + '<tr>'. |
|
| 527 | + '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'. |
|
| 528 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 529 | + $backup->cleanupCount(). |
|
| 530 | + '</td>'. |
|
| 531 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 532 | + $backup->cleanupCountSkipped(). |
|
| 533 | + '</td>'. |
|
| 534 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 535 | + $backup->cleanupCountFailed(). |
|
| 536 | + '</td>'. |
|
| 537 | 537 | '</tr>'; |
| 538 | 538 | |
| 539 | 539 | } |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | */ |
| 550 | 550 | protected function getFooterHtml() |
| 551 | 551 | { |
| 552 | - return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
|
| 552 | + return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'. |
|
| 553 | 553 | '</td></tr></table>'; |
| 554 | 554 | } |
| 555 | 555 | } |