@@ -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 | } |
@@ -9,16 +9,16 @@ discard block |
||
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 | } |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | ])) { |
33 | 33 | continue; |
34 | 34 | } |
35 | - echo $package->name . ': ' . $package->version; |
|
35 | + echo $package->name.': '.$package->version; |
|
36 | 36 | if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) { |
37 | - echo '@' . $package->source->reference; |
|
37 | + echo '@'.$package->source->reference; |
|
38 | 38 | } |
39 | 39 | echo PHP_EOL; |
40 | 40 | } |
@@ -244,9 +244,9 @@ discard block |
||
244 | 244 | */ |
245 | 245 | protected function createCommandLine() : CommandLine |
246 | 246 | { |
247 | - $password = !empty($this->password) ? 'RSYNC_PASSWORD=' . escapeshellarg($this->password) . ' ' : ''; |
|
247 | + $password = !empty($this->password) ? 'RSYNC_PASSWORD='.escapeshellarg($this->password).' ' : ''; |
|
248 | 248 | $process = new CommandLine(); |
249 | - $cmd = new Cmd($password . $this->binary); |
|
249 | + $cmd = new Cmd($password.$this->binary); |
|
250 | 250 | $process->addCommand($cmd); |
251 | 251 | |
252 | 252 | if (!empty($this->args)) { |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | $this->validateLocations(); |
257 | 257 | |
258 | 258 | // use archive mode, verbose and compress if not already done |
259 | - $options = '-av' . ($this->compressed ? 'z' : ''); |
|
259 | + $options = '-av'.($this->compressed ? 'z' : ''); |
|
260 | 260 | $cmd->addOption($options); |
261 | 261 | $this->configureExcludes($cmd, $this->excludes); |
262 | 262 | $cmd->addOptionIfNotEmpty('--delete', $this->delete, false); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | { |
127 | 127 | foreach (['key', 'secret', 'bucket', 'region', 'path'] as $option) { |
128 | 128 | if (!Arr::isSetAndNotEmptyString($config, $option)) { |
129 | - throw new Exception('AWS S3 ' . $option . ' is mandatory'); |
|
129 | + throw new Exception('AWS S3 '.$option.' is mandatory'); |
|
130 | 130 | } |
131 | 131 | } |
132 | 132 | } |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | public function simulate(Target $target, Result $result) |
151 | 151 | { |
152 | 152 | $result->debug( |
153 | - 'sync backup to Amazon S3' . PHP_EOL |
|
154 | - . ' region: ' . $this->region . PHP_EOL |
|
155 | - . ' key: ' . $this->key . PHP_EOL |
|
156 | - . ' secret: ********' . PHP_EOL |
|
157 | - . ' location: ' . $this->bucket |
|
153 | + 'sync backup to Amazon S3'.PHP_EOL |
|
154 | + . ' region: '.$this->region.PHP_EOL |
|
155 | + . ' key: '.$this->key.PHP_EOL |
|
156 | + . ' secret: ********'.PHP_EOL |
|
157 | + . ' location: '.$this->bucket |
|
158 | 158 | ); |
159 | 159 | } |
160 | 160 |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $messages = []; |
42 | 42 | /** @var \Exception $e */ |
43 | 43 | foreach ($errors as $e) { |
44 | - $messages[] = $e->getMessage() . ' in file:' . $e->getFile() . ' at line' . $e->getLine(); |
|
44 | + $messages[] = $e->getMessage().' in file:'.$e->getFile().' at line'.$e->getLine(); |
|
45 | 45 | } |
46 | 46 | return implode(';', $messages); |
47 | 47 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | private function loadBodyFromTemplate(string $template) : string |
46 | 46 | { |
47 | 47 | if (!file_exists($template)) { |
48 | - throw new Exception('template not found: ' . $template); |
|
48 | + throw new Exception('template not found: '.$template); |
|
49 | 49 | } |
50 | 50 | return file_get_contents($template); |
51 | 51 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | { |
116 | 116 | $subTemplate = ''; |
117 | 117 | $match = []; |
118 | - if (preg_match('#%%' . $loop . '%%([\w\W\s]*)%%' . $loop . '%%#im', $template, $match)) { |
|
118 | + if (preg_match('#%%'.$loop.'%%([\w\W\s]*)%%'.$loop.'%%#im', $template, $match)) { |
|
119 | 119 | $subTemplate = $match[1]; |
120 | 120 | } |
121 | 121 | return $subTemplate; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $markup = ''; |
134 | 134 | /* @var $e \Exception */ |
135 | 135 | foreach ($errors as $e) { |
136 | - $data = [ |
|
136 | + $data = [ |
|
137 | 137 | 'class' => get_class($e), |
138 | 138 | 'message' => $e->getMessage(), |
139 | 139 | 'file' => $e->getFile(), |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $markup = ''; |
157 | 157 | /* @var $b \phpbu\App\Result\Backup */ |
158 | 158 | foreach ($backups as $b) { |
159 | - $data = [ |
|
159 | + $data = [ |
|
160 | 160 | 'name' => $b->getName(), |
161 | 161 | 'status' => $b->allOk() ? 0 : 1, |
162 | 162 | 'checkCount' => $b->checkCount(), |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | private function renderTemplate(string $template, array $data) : string |
187 | 187 | { |
188 | 188 | foreach ($data as $name => $value) { |
189 | - $template = str_replace('%' . $name . '%', $value, $template); |
|
189 | + $template = str_replace('%'.$name.'%', $value, $template); |
|
190 | 190 | } |
191 | 191 | return $template; |
192 | 192 | } |
@@ -199,6 +199,6 @@ discard block |
||
199 | 199 | */ |
200 | 200 | private function renderLoop(string $loop, string $markup) |
201 | 201 | { |
202 | - $this->template = preg_replace('#%%' . $loop . '%%[\w\W\s]*%%' . $loop . '%%#im', $markup, $this->template); |
|
202 | + $this->template = preg_replace('#%%'.$loop.'%%[\w\W\s]*%%'.$loop.'%%#im', $markup, $this->template); |
|
203 | 203 | } |
204 | 204 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | private function buildGetUri(array $data) : string |
154 | 154 | { |
155 | 155 | $glue = strpos($this->uri, '?') !== false ? '&' : '?'; |
156 | - return $this->uri . $glue . http_build_query($data); |
|
156 | + return $this->uri.$glue.http_build_query($data); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | /** |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | } |
171 | 171 | |
172 | 172 | if (!isset($this->availableFormatter[$this->contentType])) { |
173 | - throw new Exception('no default formatter for content-type: ' . $this->contentType); |
|
173 | + throw new Exception('no default formatter for content-type: '.$this->contentType); |
|
174 | 174 | } |
175 | 175 | $class = $this->availableFormatter[$this->contentType]; |
176 | 176 | return new $class(); |
@@ -214,12 +214,12 @@ discard block |
||
214 | 214 | ]; |
215 | 215 | |
216 | 216 | if (!empty($body)) { |
217 | - $headers[] = 'Content-Type: ' . $this->contentType; |
|
217 | + $headers[] = 'Content-Type: '.$this->contentType; |
|
218 | 218 | $options['http']['content'] = $body; |
219 | 219 | } |
220 | 220 | |
221 | 221 | if (!empty($this->username)) { |
222 | - $headers[] = 'Authorization: Basic ' . base64_encode($this->username . ':' . $this->password); |
|
222 | + $headers[] = 'Authorization: Basic '.base64_encode($this->username.':'.$this->password); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | $options['http']['header'] = implode("\r\n", $headers); |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | try { |
229 | 229 | file_get_contents($uri, false, $context); |
230 | 230 | } catch (\Throwable $t) { |
231 | - throw new Exception('could not reach webhook: ' . $this->uri); |
|
231 | + throw new Exception('could not reach webhook: '.$this->uri); |
|
232 | 232 | } |
233 | 233 | } |
234 | 234 | } |
@@ -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,7 +176,7 @@ 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 |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | try { |
190 | 190 | /** @var \Swift_Message $message */ |
191 | 191 | $message = new Swift_Message(); |
192 | - $message->setSubject($this->subject . ' [' . $state . ']') |
|
192 | + $message->setSubject($this->subject.' ['.$state.']') |
|
193 | 193 | ->setFrom($this->senderMail, $this->senderName) |
194 | 194 | ->setTo($this->recipients) |
195 | 195 | ->setBody($body, 'text/html'); |
@@ -328,9 +328,9 @@ discard block |
||
328 | 328 | { |
329 | 329 | if (isset($options['sendmail.path'])) { |
330 | 330 | $path = $options['sendmail.path']; |
331 | - $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : ''; |
|
331 | + $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : ''; |
|
332 | 332 | /* @var $transport \Swift_SendmailTransport */ |
333 | - return new \Swift_SendmailTransport($path . $options); |
|
333 | + return new \Swift_SendmailTransport($path.$options); |
|
334 | 334 | } |
335 | 335 | return new \Swift_SendmailTransport(); |
336 | 336 | } |
@@ -342,8 +342,8 @@ discard block |
||
342 | 342 | */ |
343 | 343 | protected function getHeaderHtml() |
344 | 344 | { |
345 | - return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
|
346 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
345 | + return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'. |
|
346 | + '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>'; |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | /** |
@@ -380,12 +380,12 @@ discard block |
||
380 | 380 | $this->numCleanups, |
381 | 381 | Str::appendPluralS('cleanup', $this->numCleanups) |
382 | 382 | ); |
383 | - $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' . |
|
384 | - '<tr><td>' . |
|
385 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
386 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
387 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
388 | - '</td></tr>' . |
|
383 | + $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'. |
|
384 | + '<tr><td>'. |
|
385 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'. |
|
386 | + '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'. |
|
387 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'. |
|
388 | + '</td></tr>'. |
|
389 | 389 | '</table>'; |
390 | 390 | |
391 | 391 | return $html; |
@@ -402,17 +402,17 @@ discard block |
||
402 | 402 | $html = ''; |
403 | 403 | $errors = $result->getErrors(); |
404 | 404 | if (count($errors)) { |
405 | - $html .= '<table ' . TPL::getSnippet('sTableError') . '>'; |
|
405 | + $html .= '<table '.TPL::getSnippet('sTableError').'>'; |
|
406 | 406 | /* @var $e Exception */ |
407 | 407 | foreach ($errors as $e) { |
408 | - $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' . |
|
408 | + $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'. |
|
409 | 409 | sprintf( |
410 | 410 | "Exception '%s' with message '%s' in %s:%d", |
411 | 411 | get_class($e), |
412 | 412 | $e->getMessage(), |
413 | 413 | $e->getFile(), |
414 | 414 | $e->getLine() |
415 | - ) . |
|
415 | + ). |
|
416 | 416 | '</td></tr>'; |
417 | 417 | |
418 | 418 | } |
@@ -432,78 +432,78 @@ discard block |
||
432 | 432 | $html = ''; |
433 | 433 | $backups = $result->getBackups(); |
434 | 434 | if (count($backups)) { |
435 | - $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>'; |
|
435 | + $html .= '<table '.TPL::getSnippet('sTableBackup').'>'; |
|
436 | 436 | /** @var \phpbu\App\Result\Backup $backup */ |
437 | 437 | foreach ($backups as $backup) { |
438 | 438 | if ($backup->allOk()) { |
439 | 439 | $color = TPL::getSnippet('cStatusOK'); |
440 | 440 | $status = 'OK'; |
441 | - } elseif($backup->okButSkipsOrFails()) { |
|
441 | + } elseif ($backup->okButSkipsOrFails()) { |
|
442 | 442 | $color = TPL::getSnippet('cStatusWARN'); |
443 | 443 | $status = 'WARNING'; |
444 | 444 | } else { |
445 | 445 | $color = TPL::getSnippet('cStatusFAIL'); |
446 | 446 | $status = 'FAILURE'; |
447 | 447 | } |
448 | - $html .= '<tr>' . |
|
449 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
450 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
451 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
452 | - '</td>' . |
|
453 | - '</tr>' . |
|
454 | - '<tr>' . |
|
455 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
456 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
457 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
458 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
448 | + $html .= '<tr>'. |
|
449 | + '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'. |
|
450 | + sprintf('backup <em>%s</em>', $backup->getName()). |
|
451 | + ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'. |
|
452 | + '</td>'. |
|
453 | + '</tr>'. |
|
454 | + '<tr>'. |
|
455 | + '<td '.TPL::getSnippet('sRowHead').'> </td>'. |
|
456 | + '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'. |
|
457 | + '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'. |
|
458 | + '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'. |
|
459 | 459 | '</tr>'; |
460 | 460 | |
461 | - $html .= '<tr>' . |
|
462 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
463 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
464 | - $backup->checkCount() . ' |
|
461 | + $html .= '<tr>'. |
|
462 | + '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'. |
|
463 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
464 | + $backup->checkCount().' |
|
465 | 465 | </td>' . |
466 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
466 | + '<td '.TPL::getSnippet('sRowCheck').' align="right"> |
|
467 | 467 | |
468 | 468 | </td>' . |
469 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
470 | - $backup->checkCountFailed() . |
|
471 | - '</td>' . |
|
472 | - '</tr>' . |
|
473 | - '<tr>' . |
|
474 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
475 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
476 | - $backup->cryptCount() . |
|
477 | - '</td>' . |
|
478 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
479 | - $backup->cryptCountSkipped() . |
|
480 | - '</td>' . |
|
481 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
482 | - $backup->cryptCountFailed() . |
|
483 | - '</td>' . |
|
484 | - '</tr>' . |
|
485 | - '<tr>' . |
|
486 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
487 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
488 | - $backup->syncCount() . '</td>' . |
|
489 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
490 | - $backup->syncCountSkipped() . |
|
491 | - '</td>' . |
|
492 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
493 | - $backup->syncCountFailed() . |
|
494 | - '</td>' . |
|
495 | - '</tr>' . |
|
496 | - '<tr>' . |
|
497 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
498 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
499 | - $backup->cleanupCount() . |
|
500 | - '</td>' . |
|
501 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
502 | - $backup->cleanupCountSkipped() . |
|
503 | - '</td>' . |
|
504 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
505 | - $backup->cleanupCountFailed() . |
|
506 | - '</td>' . |
|
469 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
470 | + $backup->checkCountFailed(). |
|
471 | + '</td>'. |
|
472 | + '</tr>'. |
|
473 | + '<tr>'. |
|
474 | + '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'. |
|
475 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
476 | + $backup->cryptCount(). |
|
477 | + '</td>'. |
|
478 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
479 | + $backup->cryptCountSkipped(). |
|
480 | + '</td>'. |
|
481 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
482 | + $backup->cryptCountFailed(). |
|
483 | + '</td>'. |
|
484 | + '</tr>'. |
|
485 | + '<tr>'. |
|
486 | + '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'. |
|
487 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
488 | + $backup->syncCount().'</td>'. |
|
489 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
490 | + $backup->syncCountSkipped(). |
|
491 | + '</td>'. |
|
492 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
493 | + $backup->syncCountFailed(). |
|
494 | + '</td>'. |
|
495 | + '</tr>'. |
|
496 | + '<tr>'. |
|
497 | + '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'. |
|
498 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
499 | + $backup->cleanupCount(). |
|
500 | + '</td>'. |
|
501 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
502 | + $backup->cleanupCountSkipped(). |
|
503 | + '</td>'. |
|
504 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
505 | + $backup->cleanupCountFailed(). |
|
506 | + '</td>'. |
|
507 | 507 | '</tr>'; |
508 | 508 | |
509 | 509 | } |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | */ |
520 | 520 | protected function getFooterHtml() |
521 | 521 | { |
522 | - return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
|
522 | + return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'. |
|
523 | 523 | '</td></tr></table>'; |
524 | 524 | } |
525 | 525 | } |