@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | $saveResult = $redisSave->run(); |
107 | 107 | $result->debug($this->getExecutable($target)->getCommandLinePrintable()); |
108 | 108 | if (!$saveResult->wasSuccessful()) { |
109 | - throw new Exception('redis-cli BGSAVE failed:' . $saveResult->getStdErr()); |
|
109 | + throw new Exception('redis-cli BGSAVE failed:'.$saveResult->getStdErr()); |
|
110 | 110 | } |
111 | 111 | // check if the save process is finished |
112 | 112 | $this->isDumpCreatedYet($lastBackupTimestamp, $redisLast); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | private function copyDumpToTarget(Target $target) |
196 | 196 | { |
197 | 197 | if (!file_exists($this->pathToRedisData)) { |
198 | - throw new Exception('Redis data not found at: \'' . $this->pathToRedisCli . '\''); |
|
198 | + throw new Exception('Redis data not found at: \''.$this->pathToRedisCli.'\''); |
|
199 | 199 | } |
200 | 200 | $targetFile = $target->getPathnamePlain(); |
201 | 201 | copy($this->pathToRedisData, $targetFile); |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | $result->debug($this->getExecutable($target)->getCommandLinePrintable()); |
204 | 204 | |
205 | 205 | if (!$mysqldump->wasSuccessful()) { |
206 | - throw new Exception('mysqldump failed:' . $mysqldump->getStdErr()); |
|
206 | + throw new Exception('mysqldump failed:'.$mysqldump->getStdErr()); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | return $this->createStatus($target); |
@@ -258,6 +258,6 @@ discard block |
||
258 | 258 | */ |
259 | 259 | private function getDumpTarget(Target $target) |
260 | 260 | { |
261 | - return $target->getPathnamePlain() . ($this->filePerTable ? '.dump' : ''); |
|
261 | + return $target->getPathnamePlain().($this->filePerTable ? '.dump' : ''); |
|
262 | 262 | } |
263 | 263 | } |
@@ -101,7 +101,7 @@ |
||
101 | 101 | $result->debug($tar->getCmd()); |
102 | 102 | |
103 | 103 | if (!$tar->wasSuccessful()) { |
104 | - throw new Exception('tar failed: ' . $tar->getStdErr()); |
|
104 | + throw new Exception('tar failed: '.$tar->getStdErr()); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | return $this->createStatus($target); |
@@ -111,7 +111,7 @@ |
||
111 | 111 | $result->debug($this->getExecutable($target)->getCommandLinePrintable()); |
112 | 112 | |
113 | 113 | if (!$elasticdump->wasSuccessful()) { |
114 | - throw new Exception('elasticdump failed: ' . $elasticdump->getStdErr()); |
|
114 | + throw new Exception('elasticdump failed: '.$elasticdump->getStdErr()); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | return $this->createStatus($target); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $result->debug($this->getExecutable($target)->getCommandLinePrintable()); |
142 | 142 | |
143 | 143 | if (!$arangodump->wasSuccessful()) { |
144 | - throw new Exception('arangodump failed: ' . $arangodump->getStdErr()); |
|
144 | + throw new Exception('arangodump failed: '.$arangodump->getStdErr()); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | return $this->createStatus($target); |
@@ -190,6 +190,6 @@ discard block |
||
190 | 190 | */ |
191 | 191 | public function getDumpDir(Target $target) |
192 | 192 | { |
193 | - return $target->getPath() . '/dump'; |
|
193 | + return $target->getPath().'/dump'; |
|
194 | 194 | } |
195 | 195 | } |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $result->debug($this->getExecutable($target)->getCommandLinePrintable()); |
161 | 161 | |
162 | 162 | if (!$mongodump->wasSuccessful()) { |
163 | - throw new Exception('mongodump failed: ' . $mongodump->getStdErr()); |
|
163 | + throw new Exception('mongodump failed: '.$mongodump->getStdErr()); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | return $this->createStatus($target); |
@@ -208,6 +208,6 @@ discard block |
||
208 | 208 | */ |
209 | 209 | public function getDumpDir(Target $target) |
210 | 210 | { |
211 | - return $target->getPath() . '/dump'; |
|
211 | + return $target->getPath().'/dump'; |
|
212 | 212 | } |
213 | 213 | } |
@@ -246,7 +246,7 @@ |
||
246 | 246 | $result->debug($this->getExecutable($target)->getCommandLinePrintable()); |
247 | 247 | |
248 | 248 | if (!$pgDump->wasSuccessful()) { |
249 | - throw new Exception('mysqldump failed:' . $pgDump->getStdErr()); |
|
249 | + throw new Exception('mysqldump failed:'.$pgDump->getStdErr()); |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | return $this->createStatus($target); |
@@ -27,7 +27,7 @@ |
||
27 | 27 | */ |
28 | 28 | public function simulate(Target $target, Result $result) |
29 | 29 | { |
30 | - $result->debug('backup data:' . PHP_EOL . $this->getExecutable($target)->getCommandLinePrintable()); |
|
30 | + $result->debug('backup data:'.PHP_EOL.$this->getExecutable($target)->getCommandLinePrintable()); |
|
31 | 31 | |
32 | 32 | return $this->createStatus($target); |
33 | 33 | } |
@@ -171,10 +171,10 @@ discard block |
||
171 | 171 | { |
172 | 172 | $configuration = $event->getConfiguration(); |
173 | 173 | $this->write( |
174 | - Version::getVersionString() . PHP_EOL . |
|
175 | - PHP_EOL . |
|
176 | - 'Runtime: ' . $this->runtime->getNameWithVersion() . PHP_EOL . |
|
177 | - 'Configuration: ' . $configuration->getFilename() . PHP_EOL . |
|
174 | + Version::getVersionString().PHP_EOL. |
|
175 | + PHP_EOL. |
|
176 | + 'Runtime: '.$this->runtime->getNameWithVersion().PHP_EOL. |
|
177 | + 'Configuration: '.$configuration->getFilename().PHP_EOL. |
|
178 | 178 | PHP_EOL |
179 | 179 | ); |
180 | 180 | } |
@@ -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 | /** |