@@ -52,7 +52,7 @@ |
||
52 | 52 | public function sync(Target $target, Result $result) |
53 | 53 | { |
54 | 54 | // silence ftp errors |
55 | - $old = error_reporting(0); |
|
55 | + $old = error_reporting(0); |
|
56 | 56 | if (!$ftpConnection = ftp_connect($this->host)) { |
57 | 57 | throw new Exception( |
58 | 58 | sprintf( |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use phpbu\App\Listener; |
7 | 7 | use phpbu\App\Result; |
8 | 8 | use phpbu\App\Util; |
9 | -use phpbu\App\Version; |
|
10 | 9 | use PHP_Timer; |
11 | 10 | use SebastianBergmann\Environment\Console; |
12 | 11 | use SebastianBergmann\Environment\Runtime; |
@@ -172,8 +172,8 @@ discard block |
||
172 | 172 | $configuration = $event->getConfiguration(); |
173 | 173 | if ($this->verbose) { |
174 | 174 | $this->write( |
175 | - 'Runtime: ' . $this->runtime->getNameWithVersion() . PHP_EOL . |
|
176 | - 'Configuration: ' . $configuration->getFilename() . PHP_EOL . |
|
175 | + 'Runtime: '.$this->runtime->getNameWithVersion().PHP_EOL. |
|
176 | + 'Configuration: '.$configuration->getFilename().PHP_EOL. |
|
177 | 177 | PHP_EOL |
178 | 178 | ); |
179 | 179 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | $this->numBackups++; |
190 | 190 | if ($this->debug) { |
191 | 191 | $backup = $event->getConfiguration(); |
192 | - $this->writeWithAsterisk('backup: [' . $backup->getSource()->type . '] '); |
|
192 | + $this->writeWithAsterisk('backup: ['.$backup->getSource()->type.'] '); |
|
193 | 193 | } |
194 | 194 | } |
195 | 195 | |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | public function onBackupFailed(Event\Backup\Failed $event) |
202 | 202 | { |
203 | 203 | if ($this->debug) { |
204 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
204 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
205 | 205 | } |
206 | 206 | } |
207 | 207 | |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | public function onBackupEnd(Event\Backup\End $event) |
214 | 214 | { |
215 | 215 | if ($this->debug) { |
216 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
216 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
217 | 217 | } |
218 | 218 | } |
219 | 219 | |
@@ -227,8 +227,8 @@ discard block |
||
227 | 227 | $this->numChecks++; |
228 | 228 | if ($this->debug) { |
229 | 229 | $check = $event->getConfiguration(); |
230 | - $this->writeWithAsterisk('check: [' . $check->type . '] '); |
|
231 | - $this->write('checking: [' . $check->value . '] '); |
|
230 | + $this->writeWithAsterisk('check: ['.$check->type.'] '); |
|
231 | + $this->write('checking: ['.$check->value.'] '); |
|
232 | 232 | } |
233 | 233 | } |
234 | 234 | |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | public function onCheckFailed(Event\Check\Failed $event) |
241 | 241 | { |
242 | 242 | if ($this->debug) { |
243 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
243 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
244 | 244 | } |
245 | 245 | } |
246 | 246 | |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | public function onCheckEnd(Event\Check\End $event) |
253 | 253 | { |
254 | 254 | if ($this->debug) { |
255 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
255 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
256 | 256 | } |
257 | 257 | } |
258 | 258 | |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $this->numCrypts++; |
267 | 267 | if ($this->debug) { |
268 | 268 | $crypt = $event->getConfiguration(); |
269 | - $this->writeWithAsterisk('crypt: [' . $crypt->type . '] '); |
|
269 | + $this->writeWithAsterisk('crypt: ['.$crypt->type.'] '); |
|
270 | 270 | } |
271 | 271 | } |
272 | 272 | |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | public function onCryptSkipped(Event\Crypt\Skipped $event) |
279 | 279 | { |
280 | 280 | if ($this->debug) { |
281 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
281 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
282 | 282 | } |
283 | 283 | } |
284 | 284 | |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | public function onCryptFailed(Event\Crypt\Failed $event) |
291 | 291 | { |
292 | 292 | if ($this->debug) { |
293 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
293 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
294 | 294 | } |
295 | 295 | } |
296 | 296 | |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | public function onCryptEnd(Event\Crypt\End $event) |
303 | 303 | { |
304 | 304 | if ($this->debug) { |
305 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
305 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
306 | 306 | } |
307 | 307 | } |
308 | 308 | |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | $this->numSyncs++; |
317 | 317 | if ($this->debug) { |
318 | 318 | $sync = $event->getConfiguration(); |
319 | - $this->writeWithAsterisk('sync: [' . $sync->type . '] '); |
|
319 | + $this->writeWithAsterisk('sync: ['.$sync->type.'] '); |
|
320 | 320 | } |
321 | 321 | } |
322 | 322 | |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | public function onSyncSkipped(Event\Sync\Skipped $event) |
329 | 329 | { |
330 | 330 | if ($this->debug) { |
331 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
331 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
332 | 332 | } |
333 | 333 | } |
334 | 334 | |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | public function onSyncFailed(Event\Sync\Failed $event) |
341 | 341 | { |
342 | 342 | if ($this->debug) { |
343 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
343 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
344 | 344 | } |
345 | 345 | } |
346 | 346 | |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | public function onSyncEnd(Event\Sync\End $event) |
353 | 353 | { |
354 | 354 | if ($this->debug) { |
355 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
355 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
356 | 356 | } |
357 | 357 | } |
358 | 358 | |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | $this->numCleanups++; |
367 | 367 | if ($this->debug) { |
368 | 368 | $cleanup = $event->getConfiguration(); |
369 | - $this->writeWithAsterisk('cleanup: [' . $cleanup->type . '] '); |
|
369 | + $this->writeWithAsterisk('cleanup: ['.$cleanup->type.'] '); |
|
370 | 370 | } |
371 | 371 | } |
372 | 372 | |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | public function onCleanupSkipped(Event\Cleanup\Skipped $event) |
379 | 379 | { |
380 | 380 | if ($this->debug) { |
381 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
381 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
382 | 382 | } |
383 | 383 | } |
384 | 384 | |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | public function onCleanupFailed(Event\Cleanup\Failed $event) |
391 | 391 | { |
392 | 392 | if ($this->debug) { |
393 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
393 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
394 | 394 | } |
395 | 395 | } |
396 | 396 | |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | public function onCleanupEnd(Event\Cleanup\End $event) |
403 | 403 | { |
404 | 404 | if ($this->debug) { |
405 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
405 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
406 | 406 | } |
407 | 407 | } |
408 | 408 | |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | public function onDebug(Event\Debug $event) |
415 | 415 | { |
416 | 416 | if ($this->debug) { |
417 | - $this->write($event->getMessage() . PHP_EOL); |
|
417 | + $this->write($event->getMessage().PHP_EOL); |
|
418 | 418 | } |
419 | 419 | } |
420 | 420 | |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | */ |
453 | 453 | protected function printHeader() |
454 | 454 | { |
455 | - $this->write(PHP_Timer::resourceUsage() . PHP_EOL . PHP_EOL); |
|
455 | + $this->write(PHP_Timer::resourceUsage().PHP_EOL.PHP_EOL); |
|
456 | 456 | } |
457 | 457 | |
458 | 458 | /** |
@@ -512,13 +512,13 @@ discard block |
||
512 | 512 | $clSkipped = str_pad($backup->cleanupCountSkipped(), 7, ' ', STR_PAD_LEFT); |
513 | 513 | $clFailed = str_pad($backup->cleanupCountFailed(), 6, ' ', STR_PAD_LEFT); |
514 | 514 | |
515 | - $out = PHP_EOL . ' | executed | skipped | failed |' . PHP_EOL |
|
516 | - . '----------+----------+---------+--------+' . PHP_EOL |
|
517 | - . ' checks | ' . $chExecuted . ' | | ' . $chFailed . ' |' . PHP_EOL |
|
518 | - . ' crypts | ' . $crExecuted . ' | ' . $crSkipped . ' | ' . $crFailed . ' |' . PHP_EOL |
|
519 | - . ' syncs | ' . $syExecuted . ' | ' . $sySkipped . ' | ' . $syFailed . ' |' . PHP_EOL |
|
520 | - . ' cleanups | ' . $clExecuted . ' | ' . $clSkipped . ' | ' . $clFailed . ' |' . PHP_EOL |
|
521 | - . '----------+----------+---------+--------+' . PHP_EOL . PHP_EOL; |
|
515 | + $out = PHP_EOL.' | executed | skipped | failed |'.PHP_EOL |
|
516 | + . '----------+----------+---------+--------+'.PHP_EOL |
|
517 | + . ' checks | '.$chExecuted.' | | '.$chFailed.' |'.PHP_EOL |
|
518 | + . ' crypts | '.$crExecuted.' | '.$crSkipped.' | '.$crFailed.' |'.PHP_EOL |
|
519 | + . ' syncs | '.$syExecuted.' | '.$sySkipped.' | '.$syFailed.' |'.PHP_EOL |
|
520 | + . ' cleanups | '.$clExecuted.' | '.$clSkipped.' | '.$clFailed.' |'.PHP_EOL |
|
521 | + . '----------+----------+---------+--------+'.PHP_EOL.PHP_EOL; |
|
522 | 522 | |
523 | 523 | $this->write($out); |
524 | 524 | } |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | $this->writeWithColor( |
540 | 540 | 'fg-black, bg-green', |
541 | 541 | sprintf( |
542 | - 'OK (%d %s, %d %s, %d %s, %d %s, %d %s)' . PHP_EOL, |
|
542 | + 'OK (%d %s, %d %s, %d %s, %d %s, %d %s)'.PHP_EOL, |
|
543 | 543 | count($result->getBackups()), |
544 | 544 | Util\Str::appendPluralS('backup', count($result->getBackups())), |
545 | 545 | $this->numChecks, |
@@ -556,8 +556,8 @@ discard block |
||
556 | 556 | $this->writeWithColor( |
557 | 557 | 'fg-black, bg-yellow', |
558 | 558 | sprintf( |
559 | - "WARNING, skipped|failed Crypts, Syncs or Cleanups!" . PHP_EOL . |
|
560 | - 'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d ' . PHP_EOL, |
|
559 | + "WARNING, skipped|failed Crypts, Syncs or Cleanups!".PHP_EOL. |
|
560 | + 'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d '.PHP_EOL, |
|
561 | 561 | count($result->getBackups()), |
562 | 562 | $result->cryptsSkippedCount(), |
563 | 563 | $result->cryptsFailedCount(), |
@@ -571,8 +571,8 @@ discard block |
||
571 | 571 | $this->writeWithColor( |
572 | 572 | 'fg-white, bg-red', |
573 | 573 | sprintf( |
574 | - "FAILURE!" . PHP_EOL . |
|
575 | - 'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.' . PHP_EOL, |
|
574 | + "FAILURE!".PHP_EOL. |
|
575 | + 'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.'.PHP_EOL, |
|
576 | 576 | count($result->getBackups()), |
577 | 577 | $result->checksFailedCount(), |
578 | 578 | $result->cryptsFailedCount(), |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | if ($this->colors) { |
596 | 596 | $buffer = Util\Cli::formatWithColor($color, $buffer); |
597 | 597 | } |
598 | - $this->write($buffer . PHP_EOL); |
|
598 | + $this->write($buffer.PHP_EOL); |
|
599 | 599 | } |
600 | 600 | |
601 | 601 | /** |
@@ -57,6 +57,6 @@ |
||
57 | 57 | */ |
58 | 58 | public static function getVersionString() : string |
59 | 59 | { |
60 | - return 'phpbu ' . self::id() . ' by Sebastian Feldmann and contributors.'; |
|
60 | + return 'phpbu '.self::id().' by Sebastian Feldmann and contributors.'; |
|
61 | 61 | } |
62 | 62 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | public function encryptFile(string $file) : OpenSSL |
178 | 178 | { |
179 | 179 | $this->sourceFile = $file; |
180 | - $this->targetFile = $file . '.enc'; |
|
180 | + $this->targetFile = $file.'.enc'; |
|
181 | 181 | return $this; |
182 | 182 | } |
183 | 183 | |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | { |
311 | 311 | $cmd->addOption('smime'); |
312 | 312 | $cmd->addOption('-encrypt'); |
313 | - $cmd->addOption('-' . $this->algorithm); |
|
313 | + $cmd->addOption('-'.$this->algorithm); |
|
314 | 314 | $cmd->addOption('-binary'); |
315 | 315 | $cmd->addOption('-in', $this->sourceFile, ' '); |
316 | 316 | $cmd->addOption('-out', $this->targetFile, ' '); |
@@ -325,12 +325,12 @@ discard block |
||
325 | 325 | */ |
326 | 326 | protected function setPasswordOptions(Cmd $cmd) |
327 | 327 | { |
328 | - $password = 'pass:' . $this->password; |
|
328 | + $password = 'pass:'.$this->password; |
|
329 | 329 | |
330 | 330 | $cmd->addOption('enc'); |
331 | 331 | $cmd->addOption('-e'); |
332 | 332 | $cmd->addOptionIfNotEmpty('-a', $this->base64, false); |
333 | - $cmd->addOption('-' . $this->algorithm); |
|
333 | + $cmd->addOption('-'.$this->algorithm); |
|
334 | 334 | $cmd->addOption('-pass', $password, ' '); |
335 | 335 | $cmd->addOption('-in', $this->sourceFile, ' '); |
336 | 336 | $cmd->addOption('-out', $this->targetFile, ' '); |
@@ -80,7 +80,7 @@ |
||
80 | 80 | */ |
81 | 81 | public function runCommand(string $command) : RedisCli |
82 | 82 | { |
83 | - if(!isset($this->availableCommands[$command])) { |
|
83 | + if (!isset($this->availableCommands[$command])) { |
|
84 | 84 | throw new Exception('Unknown redis-cli command'); |
85 | 85 | } |
86 | 86 | $this->command = $command; |
@@ -173,7 +173,7 @@ |
||
173 | 173 | $tar = new Cmd($this->binary); |
174 | 174 | |
175 | 175 | $tar->addOptionIfNotEmpty('--ignore-failed-read', $this->ignoreFailedRead, false); |
176 | - $tar->addOption('-' . $this->compression . 'cf'); |
|
176 | + $tar->addOption('-'.$this->compression.'cf'); |
|
177 | 177 | $tar->addArgument($this->tarPathname); |
178 | 178 | $tar->addOption('-C', dirname($this->path), ' '); |
179 | 179 | $tar->addArgument(basename($this->path)); |
@@ -453,8 +453,8 @@ |
||
453 | 453 | protected function createCommandLine() : CommandLine |
454 | 454 | { |
455 | 455 | $process = new CommandLine(); |
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 |
@@ -102,9 +102,9 @@ |
||
102 | 102 | if (!empty($this->host)) { |
103 | 103 | // remote user |
104 | 104 | if (!empty($this->user)) { |
105 | - $return .= $this->user . '@'; |
|
105 | + $return .= $this->user.'@'; |
|
106 | 106 | } |
107 | - $return .= $this->host . ':'; |
|
107 | + $return .= $this->host.':'; |
|
108 | 108 | } |
109 | 109 | $return .= $this->path; |
110 | 110 |
@@ -39,7 +39,7 @@ |
||
39 | 39 | */ |
40 | 40 | public function __construct(Runner $runner = null) |
41 | 41 | { |
42 | - $this->runner = $runner ? : new Runner\Simple(); |
|
42 | + $this->runner = $runner ?: new Runner\Simple(); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |