@@ -27,7 +27,7 @@ |
||
27 | 27 | */ |
28 | 28 | public function simulate(Target $target, Result $result) : Status |
29 | 29 | { |
30 | - $result->debug('backup data:' . PHP_EOL . $this->getExecutable($target)->getCommandPrintable()); |
|
30 | + $result->debug('backup data:'.PHP_EOL.$this->getExecutable($target)->getCommandPrintable()); |
|
31 | 31 | |
32 | 32 | return $this->createStatus($target); |
33 | 33 | } |
@@ -246,7 +246,7 @@ |
||
246 | 246 | $result->debug($pgDump->getCmdPrintable()); |
247 | 247 | |
248 | 248 | if (!$pgDump->isSuccessful()) { |
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); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $result->debug($this->getExecutable($target)->getCommandPrintable()); |
124 | 124 | |
125 | 125 | if (!$innobackupex->isSuccessful()) { |
126 | - throw new Exception('XtraBackup failed: ' . $innobackupex->getStdErr()); |
|
126 | + throw new Exception('XtraBackup failed: '.$innobackupex->getStdErr()); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | return $this->createStatus($target); |
@@ -167,6 +167,6 @@ discard block |
||
167 | 167 | */ |
168 | 168 | public function getDumpDir(Target $target) : string |
169 | 169 | { |
170 | - return $target->getPath() . '/dump'; |
|
170 | + return $target->getPath().'/dump'; |
|
171 | 171 | } |
172 | 172 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $result->debug($arangodump->getCmdPrintable()); |
145 | 145 | |
146 | 146 | if (!$arangodump->isSuccessful()) { |
147 | - throw new Exception('arangodump failed: ' . $arangodump->getStdErr()); |
|
147 | + throw new Exception('arangodump failed: '.$arangodump->getStdErr()); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | return $this->createStatus($target); |
@@ -190,6 +190,6 @@ discard block |
||
190 | 190 | */ |
191 | 191 | public function getDumpDir(Target $target) : string |
192 | 192 | { |
193 | - return $target->getPath() . '/dump'; |
|
193 | + return $target->getPath().'/dump'; |
|
194 | 194 | } |
195 | 195 | } |
@@ -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 | } |
@@ -162,8 +162,8 @@ discard block |
||
162 | 162 | $configuration = $event->getConfiguration(); |
163 | 163 | if ($this->verbose) { |
164 | 164 | $this->write( |
165 | - 'Runtime: ' . $this->runtime->getNameWithVersion() . PHP_EOL . |
|
166 | - 'Configuration: ' . $configuration->getFilename() . PHP_EOL . |
|
165 | + 'Runtime: '.$this->runtime->getNameWithVersion().PHP_EOL. |
|
166 | + 'Configuration: '.$configuration->getFilename().PHP_EOL. |
|
167 | 167 | PHP_EOL |
168 | 168 | ); |
169 | 169 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $this->numBackups++; |
180 | 180 | if ($this->debug) { |
181 | 181 | $backup = $event->getConfiguration(); |
182 | - $this->writeWithAsterisk('backup: [' . $backup->getSource()->type . '] '); |
|
182 | + $this->writeWithAsterisk('backup: ['.$backup->getSource()->type.'] '); |
|
183 | 183 | } |
184 | 184 | } |
185 | 185 | |
@@ -191,7 +191,7 @@ discard block |
||
191 | 191 | public function onBackupFailed(Event\Backup\Failed $event) |
192 | 192 | { |
193 | 193 | if ($this->debug) { |
194 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
194 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
195 | 195 | } |
196 | 196 | } |
197 | 197 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | public function onBackupEnd(Event\Backup\End $event) |
204 | 204 | { |
205 | 205 | if ($this->debug) { |
206 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
206 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | |
@@ -217,8 +217,8 @@ discard block |
||
217 | 217 | $this->numChecks++; |
218 | 218 | if ($this->debug) { |
219 | 219 | $check = $event->getConfiguration(); |
220 | - $this->writeWithAsterisk('check: [' . $check->type . '] '); |
|
221 | - $this->write('checking: [' . $check->value . '] '); |
|
220 | + $this->writeWithAsterisk('check: ['.$check->type.'] '); |
|
221 | + $this->write('checking: ['.$check->value.'] '); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | public function onCheckFailed(Event\Check\Failed $event) |
231 | 231 | { |
232 | 232 | if ($this->debug) { |
233 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
233 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
234 | 234 | } |
235 | 235 | } |
236 | 236 | |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | public function onCheckEnd(Event\Check\End $event) |
243 | 243 | { |
244 | 244 | if ($this->debug) { |
245 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
245 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
246 | 246 | } |
247 | 247 | } |
248 | 248 | |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | $this->numCrypts++; |
257 | 257 | if ($this->debug) { |
258 | 258 | $crypt = $event->getConfiguration(); |
259 | - $this->writeWithAsterisk('crypt: [' . $crypt->type . '] '); |
|
259 | + $this->writeWithAsterisk('crypt: ['.$crypt->type.'] '); |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | public function onCryptSkipped(Event\Crypt\Skipped $event) |
269 | 269 | { |
270 | 270 | if ($this->debug) { |
271 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
271 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
272 | 272 | } |
273 | 273 | } |
274 | 274 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | public function onCryptFailed(Event\Crypt\Failed $event) |
281 | 281 | { |
282 | 282 | if ($this->debug) { |
283 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
283 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
284 | 284 | } |
285 | 285 | } |
286 | 286 | |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | public function onCryptEnd(Event\Crypt\End $event) |
293 | 293 | { |
294 | 294 | if ($this->debug) { |
295 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
295 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
296 | 296 | } |
297 | 297 | } |
298 | 298 | |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | $this->numSyncs++; |
307 | 307 | if ($this->debug) { |
308 | 308 | $sync = $event->getConfiguration(); |
309 | - $this->writeWithAsterisk('sync: [' . $sync->type . '] '); |
|
309 | + $this->writeWithAsterisk('sync: ['.$sync->type.'] '); |
|
310 | 310 | } |
311 | 311 | } |
312 | 312 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | public function onSyncSkipped(Event\Sync\Skipped $event) |
319 | 319 | { |
320 | 320 | if ($this->debug) { |
321 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
321 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
322 | 322 | } |
323 | 323 | } |
324 | 324 | |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | public function onSyncFailed(Event\Sync\Failed $event) |
331 | 331 | { |
332 | 332 | if ($this->debug) { |
333 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
333 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
334 | 334 | } |
335 | 335 | } |
336 | 336 | |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | public function onSyncEnd(Event\Sync\End $event) |
343 | 343 | { |
344 | 344 | if ($this->debug) { |
345 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
345 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
346 | 346 | } |
347 | 347 | } |
348 | 348 | |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | $this->numCleanups++; |
357 | 357 | if ($this->debug) { |
358 | 358 | $cleanup = $event->getConfiguration(); |
359 | - $this->writeWithAsterisk('cleanup: [' . $cleanup->type . '] '); |
|
359 | + $this->writeWithAsterisk('cleanup: ['.$cleanup->type.'] '); |
|
360 | 360 | } |
361 | 361 | } |
362 | 362 | |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | public function onCleanupSkipped(Event\Cleanup\Skipped $event) |
369 | 369 | { |
370 | 370 | if ($this->debug) { |
371 | - $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL); |
|
371 | + $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL); |
|
372 | 372 | } |
373 | 373 | } |
374 | 374 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | public function onCleanupFailed(Event\Cleanup\Failed $event) |
381 | 381 | { |
382 | 382 | if ($this->debug) { |
383 | - $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL); |
|
383 | + $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL); |
|
384 | 384 | } |
385 | 385 | } |
386 | 386 | |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | public function onCleanupEnd(Event\Cleanup\End $event) |
393 | 393 | { |
394 | 394 | if ($this->debug) { |
395 | - $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL); |
|
395 | + $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL); |
|
396 | 396 | } |
397 | 397 | } |
398 | 398 | |
@@ -404,7 +404,7 @@ discard block |
||
404 | 404 | public function onDebug(Event\Debug $event) |
405 | 405 | { |
406 | 406 | if ($this->debug) { |
407 | - $this->write($event->getMessage() . PHP_EOL); |
|
407 | + $this->write($event->getMessage().PHP_EOL); |
|
408 | 408 | } |
409 | 409 | } |
410 | 410 | |
@@ -442,7 +442,7 @@ discard block |
||
442 | 442 | */ |
443 | 443 | protected function printHeader() |
444 | 444 | { |
445 | - $this->write(PHP_Timer::resourceUsage() . PHP_EOL . PHP_EOL); |
|
445 | + $this->write(PHP_Timer::resourceUsage().PHP_EOL.PHP_EOL); |
|
446 | 446 | } |
447 | 447 | |
448 | 448 | /** |
@@ -502,13 +502,13 @@ discard block |
||
502 | 502 | $clSkipped = str_pad($backup->cleanupCountSkipped(), 7, ' ', STR_PAD_LEFT); |
503 | 503 | $clFailed = str_pad($backup->cleanupCountFailed(), 6, ' ', STR_PAD_LEFT); |
504 | 504 | |
505 | - $out = PHP_EOL . ' | executed | skipped | failed |' . PHP_EOL |
|
506 | - . '----------+----------+---------+--------+' . PHP_EOL |
|
507 | - . ' checks | ' . $chExecuted . ' | | ' . $chFailed . ' |' . PHP_EOL |
|
508 | - . ' crypts | ' . $crExecuted . ' | ' . $crSkipped . ' | ' . $crFailed . ' |' . PHP_EOL |
|
509 | - . ' syncs | ' . $syExecuted . ' | ' . $sySkipped . ' | ' . $syFailed . ' |' . PHP_EOL |
|
510 | - . ' cleanups | ' . $clExecuted . ' | ' . $clSkipped . ' | ' . $clFailed . ' |' . PHP_EOL |
|
511 | - . '----------+----------+---------+--------+' . PHP_EOL . PHP_EOL; |
|
505 | + $out = PHP_EOL.' | executed | skipped | failed |'.PHP_EOL |
|
506 | + . '----------+----------+---------+--------+'.PHP_EOL |
|
507 | + . ' checks | '.$chExecuted.' | | '.$chFailed.' |'.PHP_EOL |
|
508 | + . ' crypts | '.$crExecuted.' | '.$crSkipped.' | '.$crFailed.' |'.PHP_EOL |
|
509 | + . ' syncs | '.$syExecuted.' | '.$sySkipped.' | '.$syFailed.' |'.PHP_EOL |
|
510 | + . ' cleanups | '.$clExecuted.' | '.$clSkipped.' | '.$clFailed.' |'.PHP_EOL |
|
511 | + . '----------+----------+---------+--------+'.PHP_EOL.PHP_EOL; |
|
512 | 512 | |
513 | 513 | $this->write($out); |
514 | 514 | } |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | $this->writeWithColor( |
530 | 530 | 'fg-green', |
531 | 531 | sprintf( |
532 | - 'OK (%d %s, %d %s, %d %s, %d %s, %d %s)' . PHP_EOL, |
|
532 | + 'OK (%d %s, %d %s, %d %s, %d %s, %d %s)'.PHP_EOL, |
|
533 | 533 | count($result->getBackups()), |
534 | 534 | Util\Str::appendPluralS('backup', count($result->getBackups())), |
535 | 535 | $this->numChecks, |
@@ -546,8 +546,8 @@ discard block |
||
546 | 546 | $this->writeWithColor( |
547 | 547 | 'fg-yellow', |
548 | 548 | sprintf( |
549 | - "WARNING, skipped|failed Crypts, Syncs or Cleanups!" . PHP_EOL . |
|
550 | - 'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d ' . PHP_EOL, |
|
549 | + "WARNING, skipped|failed Crypts, Syncs or Cleanups!".PHP_EOL. |
|
550 | + 'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d '.PHP_EOL, |
|
551 | 551 | count($result->getBackups()), |
552 | 552 | $result->cryptsSkippedCount(), |
553 | 553 | $result->cryptsFailedCount(), |
@@ -561,8 +561,8 @@ discard block |
||
561 | 561 | $this->writeWithColor( |
562 | 562 | 'fg-red', |
563 | 563 | sprintf( |
564 | - "FAILURE!" . PHP_EOL . |
|
565 | - 'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.' . PHP_EOL, |
|
564 | + "FAILURE!".PHP_EOL. |
|
565 | + 'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.'.PHP_EOL, |
|
566 | 566 | count($result->getBackups()), |
567 | 567 | $result->checksFailedCount(), |
568 | 568 | $result->cryptsFailedCount(), |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | if ($this->colors) { |
586 | 586 | $buffer = Util\Cli::formatWithColor($color, $buffer); |
587 | 587 | } |
588 | - $this->write($buffer . PHP_EOL); |
|
588 | + $this->write($buffer.PHP_EOL); |
|
589 | 589 | } |
590 | 590 | |
591 | 591 | /** |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | public function sync(Target $target, Result $result) |
78 | 78 | { |
79 | 79 | $sourcePath = $target->getPathname(); |
80 | - $dropboxPath = $this->path . $target->getFilename(); |
|
80 | + $dropboxPath = $this->path.$target->getFilename(); |
|
81 | 81 | $config = new DropboxConfig("id", "secret", $this->token); |
82 | 82 | $client = new DropboxApi($config); |
83 | 83 | try { |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | } catch (\Exception $e) { |
87 | 87 | throw new Exception($e->getMessage(), null, $e); |
88 | 88 | } |
89 | - $result->debug('upload: done (' . $meta->getSize() . ')'); |
|
89 | + $result->debug('upload: done ('.$meta->getSize().')'); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -98,9 +98,9 @@ discard block |
||
98 | 98 | public function simulate(Target $target, Result $result) |
99 | 99 | { |
100 | 100 | $result->debug( |
101 | - 'sync backup to dropbox' . PHP_EOL |
|
102 | - . ' token: ********' . PHP_EOL |
|
103 | - . ' location: ' . $this->path |
|
101 | + 'sync backup to dropbox'.PHP_EOL |
|
102 | + . ' token: ********'.PHP_EOL |
|
103 | + . ' location: '.$this->path |
|
104 | 104 | ); |
105 | 105 | } |
106 | 106 | } |