@@ -453,8 +453,8 @@ |
||
| 453 | 453 | protected function createProcess() |
| 454 | 454 | { |
| 455 | 455 | $process = new Process(); |
| 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 |
@@ -82,8 +82,8 @@ |
||
| 82 | 82 | if ($amount < 1) { |
| 83 | 83 | throw new Exception('no command to execute'); |
| 84 | 84 | } |
| 85 | - $cmd = ($amount > 1 ? '(' . implode(' && ', $this->commands) . ')' : $this->commands[0]) |
|
| 86 | - . (!empty($this->redirectOutput) ? ' > ' . $this->redirectOutput : ''); |
|
| 85 | + $cmd = ($amount > 1 ? '('.implode(' && ', $this->commands).')' : $this->commands[0]) |
|
| 86 | + . (!empty($this->redirectOutput) ? ' > '.$this->redirectOutput : ''); |
|
| 87 | 87 | |
| 88 | 88 | return $cmd; |
| 89 | 89 | } |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | public function getCommandLine() |
| 54 | 54 | { |
| 55 | 55 | return $this->cmd |
| 56 | - . (count($this->options) ? ' ' . implode(' ', $this->options) : '') |
|
| 57 | - . ($this->isSilent ? ' 2> /dev/null' : ''); |
|
| 56 | + . (count($this->options) ? ' '.implode(' ', $this->options) : '') |
|
| 57 | + . ($this->isSilent ? ' 2> /dev/null' : ''); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | if (is_array($argument)) { |
| 87 | 87 | $glue = ' '; |
| 88 | 88 | } |
| 89 | - $argument = $glue . $this->escapeArgument($argument); |
|
| 89 | + $argument = $glue.$this->escapeArgument($argument); |
|
| 90 | 90 | } else { |
| 91 | 91 | $argument = ''; |
| 92 | 92 | } |
| 93 | - $this->options[] = $option . $argument; |
|
| 93 | + $this->options[] = $option.$argument; |
|
| 94 | 94 | |
| 95 | 95 | return $this; |
| 96 | 96 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $path = $configuration->getIncludePaths(); |
| 55 | 55 | if (count($path)) { |
| 56 | 56 | $path = implode(PATH_SEPARATOR, $path); |
| 57 | - ini_set('include_path', $path . PATH_SEPARATOR . ini_get('include_path')); |
|
| 57 | + ini_set('include_path', $path.PATH_SEPARATOR.ini_get('include_path')); |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if (!empty($filename)) { |
| 72 | 72 | $pathToFile = stream_resolve_include_path($filename); |
| 73 | 73 | if (!$pathToFile || !is_readable($pathToFile)) { |
| 74 | - throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename)); |
|
| 74 | + throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename)); |
|
| 75 | 75 | } |
| 76 | 76 | require $pathToFile; |
| 77 | 77 | } |
@@ -57,6 +57,6 @@ |
||
| 57 | 57 | */ |
| 58 | 58 | public static function getVersionString() |
| 59 | 59 | { |
| 60 | - return 'phpbu ' . self::id(); |
|
| 60 | + return 'phpbu '.self::id(); |
|
| 61 | 61 | } |
| 62 | 62 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $ext = pathinfo($filename, PATHINFO_EXTENSION); |
| 44 | 44 | $type = isset(self::$extToLoaderMap[$ext]) ? self::$extToLoaderMap[$ext] : self::DEFAULT_LOADER; |
| 45 | - $class = '\\phpbu\\App\\Configuration\\Loader\\' . $type; |
|
| 45 | + $class = '\\phpbu\\App\\Configuration\\Loader\\'.$type; |
|
| 46 | 46 | |
| 47 | 47 | return new $class($filename); |
| 48 | 48 | } |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | $loaded = $document->loadXML($contents); |
| 382 | 382 | |
| 383 | 383 | foreach (libxml_get_errors() as $error) { |
| 384 | - $message .= "\n" . $error->message; |
|
| 384 | + $message .= "\n".$error->message; |
|
| 385 | 385 | } |
| 386 | 386 | |
| 387 | 387 | libxml_use_internal_errors($internal); |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | sprintf( |
| 393 | 393 | 'Error loading file "%s".%s', |
| 394 | 394 | $filename, |
| 395 | - $message != '' ? "\n" . $message : '' |
|
| 395 | + $message != '' ? "\n".$message : '' |
|
| 396 | 396 | ) |
| 397 | 397 | ); |
| 398 | 398 | } |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | public function parseShortOption($arg, array &$options) |
| 102 | 102 | { |
| 103 | 103 | if (!isset($this->shortOptions[$arg])) { |
| 104 | - throw new Exception('unknown option: -' . $arg); |
|
| 104 | + throw new Exception('unknown option: -'.$arg); |
|
| 105 | 105 | } |
| 106 | - $options['-' . $arg] = true; |
|
| 106 | + $options['-'.$arg] = true; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
@@ -123,17 +123,17 @@ discard block |
||
| 123 | 123 | $argument = $list[1]; |
| 124 | 124 | } |
| 125 | 125 | if (count($list) > 2) { |
| 126 | - throw new Exception('invalid value for option: --' . $arg); |
|
| 126 | + throw new Exception('invalid value for option: --'.$arg); |
|
| 127 | 127 | } |
| 128 | - if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) { |
|
| 129 | - throw new Exception('unknown option: --' . $option); |
|
| 128 | + if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) { |
|
| 129 | + throw new Exception('unknown option: --'.$option); |
|
| 130 | 130 | } |
| 131 | - if ($argument === true && isset($this->longOptions[$option . '='])) { |
|
| 132 | - throw new Exception('argument required for option: --' . $option); |
|
| 131 | + if ($argument === true && isset($this->longOptions[$option.'='])) { |
|
| 132 | + throw new Exception('argument required for option: --'.$option); |
|
| 133 | 133 | } |
| 134 | 134 | if ($argument !== true && isset($this->longOptions[$option])) { |
| 135 | - throw new Exception('needless argument for option: --' . $option); |
|
| 135 | + throw new Exception('needless argument for option: --'.$option); |
|
| 136 | 136 | } |
| 137 | - $options['--' . $option] = $argument; |
|
| 137 | + $options['--'.$option] = $argument; |
|
| 138 | 138 | } |
| 139 | 139 | } |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $ret = self::EXIT_EXCEPTION; |
| 109 | 109 | } |
| 110 | 110 | } catch (\Exception $e) { |
| 111 | - echo $e->getMessage() . PHP_EOL; |
|
| 111 | + echo $e->getMessage().PHP_EOL; |
|
| 112 | 112 | $ret = self::EXIT_EXCEPTION; |
| 113 | 113 | } |
| 114 | 114 | |
@@ -211,12 +211,12 @@ discard block |
||
| 211 | 211 | */ |
| 212 | 212 | protected function findConfigurationInDir() |
| 213 | 213 | { |
| 214 | - $configurationFile = $this->arguments['configuration'] . '/phpbu.xml'; |
|
| 214 | + $configurationFile = $this->arguments['configuration'].'/phpbu.xml'; |
|
| 215 | 215 | |
| 216 | 216 | if (file_exists($configurationFile)) { |
| 217 | 217 | $this->arguments['configuration'] = realpath($configurationFile); |
| 218 | - } elseif (file_exists($configurationFile . '.dist')) { |
|
| 219 | - $this->arguments['configuration'] = realpath($configurationFile . '.dist'); |
|
| 218 | + } elseif (file_exists($configurationFile.'.dist')) { |
|
| 219 | + $this->arguments['configuration'] = realpath($configurationFile.'.dist'); |
|
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | protected function overrideConfigWithArgument(Configuration $configuration, $value) |
| 277 | 277 | { |
| 278 | 278 | if (Arr::getValue($this->arguments, $value) === true) { |
| 279 | - $setter = 'set' . ucfirst($value); |
|
| 279 | + $setter = 'set'.ucfirst($value); |
|
| 280 | 280 | $configuration->{$setter}(true); |
| 281 | 281 | } |
| 282 | 282 | } |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | |
| 291 | 291 | $remoteFilename = 'http://phar.phpbu.de/phpbu.phar'; |
| 292 | 292 | $localFilename = realpath($_SERVER['argv'][0]); |
| 293 | - $tempFilename = basename($localFilename, '.phar') . '-temp.phar'; |
|
| 293 | + $tempFilename = basename($localFilename, '.phar').'-temp.phar'; |
|
| 294 | 294 | |
| 295 | 295 | echo 'Updating the phpbu PHAR ... '; |
| 296 | 296 | |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | $phar = file_get_contents($remoteFilename); |
| 299 | 299 | error_reporting($old); |
| 300 | 300 | if (!$phar) { |
| 301 | - echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL; |
|
| 301 | + echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL; |
|
| 302 | 302 | exit(self::EXIT_EXCEPTION); |
| 303 | 303 | } |
| 304 | 304 | file_put_contents($tempFilename, $phar); |
@@ -314,11 +314,11 @@ discard block |
||
| 314 | 314 | } catch (Exception $e) { |
| 315 | 315 | // cleanup crappy phar |
| 316 | 316 | unlink($tempFilename); |
| 317 | - echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL; |
|
| 317 | + echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL; |
|
| 318 | 318 | exit(self::EXIT_EXCEPTION); |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | - echo 'done' . PHP_EOL; |
|
| 321 | + echo 'done'.PHP_EOL; |
|
| 322 | 322 | exit(self::EXIT_SUCCESS); |
| 323 | 323 | } |
| 324 | 324 | |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | return; |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - echo Version::getVersionString() . PHP_EOL; |
|
| 334 | + echo Version::getVersionString().PHP_EOL; |
|
| 335 | 335 | $this->isVersionStringPrinted = true; |
| 336 | 336 | } |
| 337 | 337 | |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | */ |
| 341 | 341 | protected function printLogo() |
| 342 | 342 | { |
| 343 | - echo self::$logo . PHP_EOL; |
|
| 343 | + echo self::$logo.PHP_EOL; |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | /** |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | |
| 365 | 365 | EOT; |
| 366 | 366 | if ($this->isPhar) { |
| 367 | - echo ' --self-update Update phpbu to the latest version.' . PHP_EOL; |
|
| 367 | + echo ' --self-update Update phpbu to the latest version.'.PHP_EOL; |
|
| 368 | 368 | } |
| 369 | 369 | } |
| 370 | 370 | |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | { |
| 379 | 379 | $help = $hint ? ', use "phpbu -h" for help' : ''; |
| 380 | 380 | $this->printVersionString(); |
| 381 | - echo $message . $help . PHP_EOL; |
|
| 381 | + echo $message.$help.PHP_EOL; |
|
| 382 | 382 | exit(self::EXIT_EXCEPTION); |
| 383 | 383 | } |
| 384 | 384 | |