@@ -60,14 +60,14 @@ |
||
60 | 60 | public function compress(Target $target, Result $result) |
61 | 61 | { |
62 | 62 | if (!$this->isPathValid($this->path)) { |
63 | - throw new Exception('path to compress should be valid: ' . $this->path); |
|
63 | + throw new Exception('path to compress should be valid: '.$this->path); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | $res = $this->execute($target); |
67 | 67 | $result->debug($res->getCmd()); |
68 | 68 | |
69 | 69 | if (0 !== $res->getCode()) { |
70 | - throw new Exception('Failed to \'compress\' file: ' . $this->path); |
|
70 | + throw new Exception('Failed to \'compress\' file: '.$this->path); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | return $this->getArchiveFile($target); |
@@ -477,7 +477,7 @@ |
||
477 | 477 | // disable output redirection if files per table is active |
478 | 478 | if (!$this->filePerTable) { |
479 | 479 | $process->redirectOutputTo( |
480 | - $this->dumpPathname . (!empty($this->compression) ? '.' . $this->compression->getSuffix() : '') |
|
480 | + $this->dumpPathname.(!empty($this->compression) ? '.'.$this->compression->getSuffix() : '') |
|
481 | 481 | ); |
482 | 482 | } |
483 | 483 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function getPipeline() |
101 | 101 | { |
102 | - return $this->isPiped() ? ' | ' . implode(' | ', $this->pipeline) : ''; |
|
102 | + return $this->isPiped() ? ' | '.implode(' | ', $this->pipeline) : ''; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -124,9 +124,9 @@ discard block |
||
124 | 124 | if ($amount < 1) { |
125 | 125 | throw new Exception('no command to execute'); |
126 | 126 | } |
127 | - $cmd = ($amount > 1 ? '(' . implode(' && ', $this->commands) . ')' : $this->commands[0]) |
|
127 | + $cmd = ($amount > 1 ? '('.implode(' && ', $this->commands).')' : $this->commands[0]) |
|
128 | 128 | . $this->getPipeline() |
129 | - . (!empty($this->redirectOutput) ? ' > ' . $this->redirectOutput : ''); |
|
129 | + . (!empty($this->redirectOutput) ? ' > '.$this->redirectOutput : ''); |
|
130 | 130 | |
131 | 131 | return $cmd; |
132 | 132 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | $this->pathElementsChanging[] = $d; |
160 | 160 | $foundChangingElement = true; |
161 | 161 | } else { |
162 | - $this->pathNotChanging .= DIRECTORY_SEPARATOR . $d; |
|
162 | + $this->pathNotChanging .= DIRECTORY_SEPARATOR.$d; |
|
163 | 163 | } |
164 | 164 | } |
165 | 165 | // replace potential date placeholder |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | */ |
258 | 258 | public function getFilename($plain = false) |
259 | 259 | { |
260 | - return $this->filename . $this->getFilenameSuffix($plain); |
|
260 | + return $this->filename.$this->getFilenameSuffix($plain); |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | /** |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | */ |
279 | 279 | public function getFilenameRaw($plain = false) |
280 | 280 | { |
281 | - return $this->filenameRaw . $this->getFilenameSuffix($plain); |
|
281 | + return $this->filenameRaw.$this->getFilenameSuffix($plain); |
|
282 | 282 | } |
283 | 283 | |
284 | 284 | /** |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | */ |
290 | 290 | public function getFilenameSuffix($plain = false) |
291 | 291 | { |
292 | - return $this->getSuffixToAppend() . ($plain ? '' : $this->getCompressionSuffix() . $this->getCrypterSuffix()); |
|
292 | + return $this->getSuffixToAppend().($plain ? '' : $this->getCompressionSuffix().$this->getCrypterSuffix()); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | /** |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | */ |
300 | 300 | public function getSuffixToAppend() |
301 | 301 | { |
302 | - return count($this->fileSuffixes) ? '.' . implode('.', $this->fileSuffixes) : ''; |
|
302 | + return count($this->fileSuffixes) ? '.'.implode('.', $this->fileSuffixes) : ''; |
|
303 | 303 | } |
304 | 304 | |
305 | 305 | /** |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | */ |
310 | 310 | public function getCompressionSuffix() |
311 | 311 | { |
312 | - return $this->shouldBeCompressed() ? '.' . $this->compression->getSuffix() : ''; |
|
312 | + return $this->shouldBeCompressed() ? '.'.$this->compression->getSuffix() : ''; |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | /** |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | */ |
320 | 320 | public function getCrypterSuffix() |
321 | 321 | { |
322 | - return $this->shouldBeEncrypted() ? '.' . $this->crypter->getSuffix() : ''; |
|
322 | + return $this->shouldBeEncrypted() ? '.'.$this->crypter->getSuffix() : ''; |
|
323 | 323 | } |
324 | 324 | |
325 | 325 | /** |
@@ -409,7 +409,7 @@ discard block |
||
409 | 409 | */ |
410 | 410 | public function getPathname($plain = false) |
411 | 411 | { |
412 | - return $this->path . DIRECTORY_SEPARATOR . $this->getFilename($plain); |
|
412 | + return $this->path.DIRECTORY_SEPARATOR.$this->getFilename($plain); |
|
413 | 413 | } |
414 | 414 | |
415 | 415 | /** |
@@ -55,9 +55,9 @@ |
||
55 | 55 | public static function getClassName($name) |
56 | 56 | { |
57 | 57 | if (!isset(self::$availableCompressors[$name])) { |
58 | - throw new Exception('Invalid compressor: ' .$name); |
|
58 | + throw new Exception('Invalid compressor: '.$name); |
|
59 | 59 | } |
60 | 60 | $class = self::$availableCompressors[$name]; |
61 | - return '\\phpbu\\App\\Backup\\Target\\Compression\\' . $class; |
|
61 | + return '\\phpbu\\App\\Backup\\Target\\Compression\\'.$class; |
|
62 | 62 | } |
63 | 63 | } |
@@ -286,7 +286,7 @@ |
||
286 | 286 | { |
287 | 287 | if (!isset(self::$classMap[$type])) { |
288 | 288 | throw new Exception( |
289 | - 'invalid type, please use only \'' . implode('\', \'', array_keys(self::$classMap)) . '\'' |
|
289 | + 'invalid type, please use only \''.implode('\', \'', array_keys(self::$classMap)).'\'' |
|
290 | 290 | ); |
291 | 291 | } |
292 | 292 | } |
@@ -77,7 +77,7 @@ |
||
77 | 77 | protected function getAdapter($name) |
78 | 78 | { |
79 | 79 | if (!isset($this->adapters[$name])) { |
80 | - throw new Exception('no adapter registered with name: ' . $name); |
|
80 | + throw new Exception('no adapter registered with name: '.$name); |
|
81 | 81 | } |
82 | 82 | return $this->adapters[$name]; |
83 | 83 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | } |
92 | 92 | // make sure the backup should be executed and is not excluded via the --limit option |
93 | 93 | if (!$configuration->isBackupActive($backup->getName())) { |
94 | - $this->result->debug('skipping backup: ' . $backup->getName() . PHP_EOL); |
|
94 | + $this->result->debug('skipping backup: '.$backup->getName().PHP_EOL); |
|
95 | 95 | continue; |
96 | 96 | } |
97 | 97 | // setup target and collector, reset failure state |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $this->executeCleanup($backup, $target, $collector); |
137 | 137 | |
138 | 138 | } catch (\Exception $e) { |
139 | - $this->result->debug('exception: ' . $e->getMessage()); |
|
139 | + $this->result->debug('exception: '.$e->getMessage()); |
|
140 | 140 | $this->result->addError($e); |
141 | 141 | $this->result->backupFailed($backup); |
142 | 142 | if ($backup->stopOnFailure()) { |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $this->result->cryptSkipped($crypt); |
265 | 265 | } else { |
266 | 266 | /* @var \phpbu\App\Runner\Crypter $runner */ |
267 | - $runner = $this->factory->createRunner('crypter', $this->configuration->isSimulation()); |
|
267 | + $runner = $this->factory->createRunner('crypter', $this->configuration->isSimulation()); |
|
268 | 268 | $runner->run($this->factory->createCrypter($crypt->type, $crypt->options), $target, $this->result); |
269 | 269 | } |
270 | 270 | } catch (Backup\Crypter\Exception $e) { |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | { |
287 | 287 | /* @var \phpbu\App\Runner\Crypter $runner */ |
288 | 288 | /* @var \phpbu\App\Configuration\Backup\Sync $sync */ |
289 | - $runner = $this->factory->createRunner('sync', $this->configuration->isSimulation()); |
|
289 | + $runner = $this->factory->createRunner('sync', $this->configuration->isSimulation()); |
|
290 | 290 | foreach ($backup->getSyncs() as $sync) { |
291 | 291 | try { |
292 | 292 | $this->result->syncStart($sync); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $ret = self::EXIT_EXCEPTION; |
110 | 110 | } |
111 | 111 | } catch (\Exception $e) { |
112 | - echo $e->getMessage() . PHP_EOL; |
|
112 | + echo $e->getMessage().PHP_EOL; |
|
113 | 113 | $ret = self::EXIT_EXCEPTION; |
114 | 114 | } |
115 | 115 | |
@@ -215,12 +215,12 @@ discard block |
||
215 | 215 | */ |
216 | 216 | protected function findConfigurationInDir() |
217 | 217 | { |
218 | - $configurationFile = $this->arguments['configuration'] . '/phpbu.xml'; |
|
218 | + $configurationFile = $this->arguments['configuration'].'/phpbu.xml'; |
|
219 | 219 | |
220 | 220 | if (file_exists($configurationFile)) { |
221 | 221 | $this->arguments['configuration'] = realpath($configurationFile); |
222 | - } elseif (file_exists($configurationFile . '.dist')) { |
|
223 | - $this->arguments['configuration'] = realpath($configurationFile . '.dist'); |
|
222 | + } elseif (file_exists($configurationFile.'.dist')) { |
|
223 | + $this->arguments['configuration'] = realpath($configurationFile.'.dist'); |
|
224 | 224 | } |
225 | 225 | } |
226 | 226 | |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | { |
284 | 284 | $value = Arr::getValue($this->arguments, $arg); |
285 | 285 | if (!empty($value)) { |
286 | - $setter = 'set' . ucfirst($arg); |
|
286 | + $setter = 'set'.ucfirst($arg); |
|
287 | 287 | $configuration->{$setter}($value); |
288 | 288 | } |
289 | 289 | } |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | |
298 | 298 | $remoteFilename = 'http://phar.phpbu.de/phpbu.phar'; |
299 | 299 | $localFilename = realpath($_SERVER['argv'][0]); |
300 | - $tempFilename = basename($localFilename, '.phar') . '-temp.phar'; |
|
300 | + $tempFilename = basename($localFilename, '.phar').'-temp.phar'; |
|
301 | 301 | |
302 | 302 | echo 'Updating the phpbu PHAR ... '; |
303 | 303 | |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | $phar = file_get_contents($remoteFilename); |
306 | 306 | error_reporting($old); |
307 | 307 | if (!$phar) { |
308 | - echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL; |
|
308 | + echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL; |
|
309 | 309 | exit(self::EXIT_EXCEPTION); |
310 | 310 | } |
311 | 311 | file_put_contents($tempFilename, $phar); |
@@ -321,11 +321,11 @@ discard block |
||
321 | 321 | } catch (Exception $e) { |
322 | 322 | // cleanup crappy phar |
323 | 323 | unlink($tempFilename); |
324 | - echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL; |
|
324 | + echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL; |
|
325 | 325 | exit(self::EXIT_EXCEPTION); |
326 | 326 | } |
327 | 327 | |
328 | - echo 'done' . PHP_EOL; |
|
328 | + echo 'done'.PHP_EOL; |
|
329 | 329 | exit(self::EXIT_SUCCESS); |
330 | 330 | } |
331 | 331 | |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | return; |
339 | 339 | } |
340 | 340 | |
341 | - echo Version::getVersionString() . PHP_EOL; |
|
341 | + echo Version::getVersionString().PHP_EOL; |
|
342 | 342 | $this->isVersionStringPrinted = true; |
343 | 343 | } |
344 | 344 | |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | */ |
348 | 348 | protected function printLogo() |
349 | 349 | { |
350 | - echo self::$logo . PHP_EOL; |
|
350 | + echo self::$logo.PHP_EOL; |
|
351 | 351 | } |
352 | 352 | |
353 | 353 | /** |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | |
372 | 372 | EOT; |
373 | 373 | if ($this->isPhar) { |
374 | - echo ' --self-update Update phpbu to the latest version.' . PHP_EOL; |
|
374 | + echo ' --self-update Update phpbu to the latest version.'.PHP_EOL; |
|
375 | 375 | } |
376 | 376 | } |
377 | 377 | |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | { |
386 | 386 | $help = $hint ? ', use "phpbu -h" for help' : ''; |
387 | 387 | $this->printVersionString(); |
388 | - echo $message . $help . PHP_EOL; |
|
388 | + echo $message.$help.PHP_EOL; |
|
389 | 389 | exit(self::EXIT_EXCEPTION); |
390 | 390 | } |
391 | 391 |