@@ -41,7 +41,7 @@ |
||
| 41 | 41 | if (!empty($filename)) { |
| 42 | 42 | $pathToFile = stream_resolve_include_path($filename); |
| 43 | 43 | if (!$pathToFile || !is_readable($pathToFile)) { |
| 44 | - throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename)); |
|
| 44 | + throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename)); |
|
| 45 | 45 | } |
| 46 | 46 | require $pathToFile; |
| 47 | 47 | } |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | $bs = $bootstrapper ?? new Bootstrapper(); |
| 45 | 45 | $ext = pathinfo($filename, PATHINFO_EXTENSION); |
| 46 | 46 | $type = isset(self::$extToLoaderMap[$ext]) ? self::$extToLoaderMap[$ext] : self::DEFAULT_LOADER; |
| 47 | - $class = '\\phpbu\\App\\Configuration\\Loader\\' . $type; |
|
| 47 | + $class = '\\phpbu\\App\\Configuration\\Loader\\'.$type; |
|
| 48 | 48 | |
| 49 | 49 | return new $class($filename, $bs); |
| 50 | 50 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | // make sure the backup should be executed and is not excluded via the --limit option |
| 56 | 56 | if (!$configuration->isBackupActive($backup->getName())) { |
| 57 | - $this->result->debug('skipping backup: ' . $backup->getName() . PHP_EOL); |
|
| 57 | + $this->result->debug('skipping backup: '.$backup->getName().PHP_EOL); |
|
| 58 | 58 | continue; |
| 59 | 59 | } |
| 60 | 60 | // setup target and collector, reset failure state |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $this->executeCleanup($backup, $target, $collector); |
| 100 | 100 | |
| 101 | 101 | } catch (\Exception $e) { |
| 102 | - $this->result->debug('exception: ' . $e->getMessage()); |
|
| 102 | + $this->result->debug('exception: '.$e->getMessage()); |
|
| 103 | 103 | $this->result->addError($e); |
| 104 | 104 | $this->result->backupFailed($backup); |
| 105 | 105 | if ($backup->stopOnFailure()) { |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | foreach ($configuration->getBackups() as $backup) { |
| 40 | 40 | // make sure the backup should be executed and is not excluded via the --limit option |
| 41 | 41 | if (!$configuration->isBackupActive($backup->getName())) { |
| 42 | - $this->result->debug('skipping backup: ' . $backup->getName() . PHP_EOL); |
|
| 42 | + $this->result->debug('skipping backup: '.$backup->getName().PHP_EOL); |
|
| 43 | 43 | continue; |
| 44 | 44 | } |
| 45 | 45 | // setup target and collector |
@@ -51,6 +51,6 @@ |
||
| 51 | 51 | */ |
| 52 | 52 | public function simulate(Target $target, $value, Collector $collector, Result $result) : bool |
| 53 | 53 | { |
| 54 | - $result->debug('checking size to be at least ' . $value . PHP_EOL); |
|
| 54 | + $result->debug('checking size to be at least '.$value.PHP_EOL); |
|
| 55 | 55 | } |
| 56 | 56 | } |
@@ -64,6 +64,6 @@ |
||
| 64 | 64 | */ |
| 65 | 65 | public function simulate(Target $target, $value, Collector $collector, Result $result): bool |
| 66 | 66 | { |
| 67 | - $result->debug('checking size difference ' . $value . '%' . PHP_EOL); |
|
| 67 | + $result->debug('checking size difference '.$value.'%'.PHP_EOL); |
|
| 68 | 68 | } |
| 69 | 69 | } |
@@ -64,14 +64,14 @@ |
||
| 64 | 64 | public function compress(Target $target, Result $result) : string |
| 65 | 65 | { |
| 66 | 66 | if (!$this->isPathValid($this->path)) { |
| 67 | - throw new Exception('path to compress should be valid: ' . $this->path); |
|
| 67 | + throw new Exception('path to compress should be valid: '.$this->path); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $res = $this->execute($target); |
| 71 | 71 | $result->debug($res->getCmd()); |
| 72 | 72 | |
| 73 | 73 | if (!$res->isSuccessful()) { |
| 74 | - throw new Exception('Failed to \'compress\' file: ' . $this->path); |
|
| 74 | + throw new Exception('Failed to \'compress\' file: '.$this->path); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | return $this->getArchiveFile($target); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $ret = self::EXIT_EXCEPTION; |
| 99 | 99 | } |
| 100 | 100 | } catch (\Exception $e) { |
| 101 | - echo $e->getMessage() . PHP_EOL; |
|
| 101 | + echo $e->getMessage().PHP_EOL; |
|
| 102 | 102 | $ret = self::EXIT_EXCEPTION; |
| 103 | 103 | } |
| 104 | 104 | |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | foreach ($settingsToOverride as $arg) { |
| 220 | 220 | $value = Arr::getValue($this->arguments, $arg); |
| 221 | 221 | if (!empty($value)) { |
| 222 | - $setter = 'set' . ucfirst($arg); |
|
| 222 | + $setter = 'set'.ucfirst($arg); |
|
| 223 | 223 | $configuration->{$setter}($value); |
| 224 | 224 | } |
| 225 | 225 | } |
@@ -235,21 +235,21 @@ discard block |
||
| 235 | 235 | // check if upgrade is necessary |
| 236 | 236 | $latestVersion = $this->getLatestVersion(); |
| 237 | 237 | if (!$this->isPharOutdated($latestVersion)) { |
| 238 | - echo 'You already have the latest version of phpbu installed.' . PHP_EOL; |
|
| 238 | + echo 'You already have the latest version of phpbu installed.'.PHP_EOL; |
|
| 239 | 239 | exit(self::EXIT_SUCCESS); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | $remoteFilename = 'http://phar.phpbu.de/phpbu.phar'; |
| 243 | 243 | $localFilename = realpath($_SERVER['argv'][0]); |
| 244 | - $tempFilename = basename($localFilename, '.phar') . '-temp.phar'; |
|
| 244 | + $tempFilename = basename($localFilename, '.phar').'-temp.phar'; |
|
| 245 | 245 | |
| 246 | - echo 'Updating the phpbu PHAR to version ' . $latestVersion . ' ... '; |
|
| 246 | + echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... '; |
|
| 247 | 247 | |
| 248 | 248 | $old = error_reporting(0); |
| 249 | 249 | $phar = file_get_contents($remoteFilename); |
| 250 | 250 | error_reporting($old); |
| 251 | 251 | if (!$phar) { |
| 252 | - echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL; |
|
| 252 | + echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL; |
|
| 253 | 253 | exit(self::EXIT_EXCEPTION); |
| 254 | 254 | } |
| 255 | 255 | file_put_contents($tempFilename, $phar); |
@@ -265,11 +265,11 @@ discard block |
||
| 265 | 265 | } catch (Exception $e) { |
| 266 | 266 | // cleanup crappy phar |
| 267 | 267 | unlink($tempFilename); |
| 268 | - echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL; |
|
| 268 | + echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL; |
|
| 269 | 269 | exit(self::EXIT_EXCEPTION); |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | - echo 'done' . PHP_EOL; |
|
| 272 | + echo 'done'.PHP_EOL; |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | /** |
@@ -281,10 +281,10 @@ discard block |
||
| 281 | 281 | |
| 282 | 282 | $latestVersion = $this->getLatestVersion(); |
| 283 | 283 | if ($this->isPharOutdated($latestVersion)) { |
| 284 | - print 'You are not using the latest version of phpbu.' . PHP_EOL |
|
| 285 | - . 'Use "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL; |
|
| 284 | + print 'You are not using the latest version of phpbu.'.PHP_EOL |
|
| 285 | + . 'Use "phpbu --self-update" to install phpbu '.$latestVersion.PHP_EOL; |
|
| 286 | 286 | } else { |
| 287 | - print 'You are using the latest version of phpbu.' . PHP_EOL; |
|
| 287 | + print 'You are using the latest version of phpbu.'.PHP_EOL; |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu'); |
| 301 | 301 | error_reporting($old); |
| 302 | 302 | if (!$version) { |
| 303 | - echo 'Network-Error: Could not check latest version.' . PHP_EOL; |
|
| 303 | + echo 'Network-Error: Could not check latest version.'.PHP_EOL; |
|
| 304 | 304 | exit(self::EXIT_EXCEPTION); |
| 305 | 305 | } |
| 306 | 306 | return $version; |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | return; |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | - echo Version::getVersionString() . PHP_EOL . PHP_EOL; |
|
| 329 | + echo Version::getVersionString().PHP_EOL.PHP_EOL; |
|
| 330 | 330 | $this->isVersionStringPrinted = true; |
| 331 | 331 | } |
| 332 | 332 | |
@@ -351,8 +351,8 @@ discard block |
||
| 351 | 351 | |
| 352 | 352 | EOT; |
| 353 | 353 | if ($this->isPhar) { |
| 354 | - echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL; |
|
| 355 | - echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL; |
|
| 354 | + echo ' --version-check Check whether phpbu is up to date.'.PHP_EOL; |
|
| 355 | + echo ' --self-update Upgrade phpbu to the latest version.'.PHP_EOL; |
|
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | { |
| 367 | 367 | $help = $hint ? ', use "phpbu -h" for help' : ''; |
| 368 | 368 | $this->printVersionString(); |
| 369 | - echo $message . $help . PHP_EOL; |
|
| 369 | + echo $message.$help.PHP_EOL; |
|
| 370 | 370 | exit(self::EXIT_EXCEPTION); |
| 371 | 371 | } |
| 372 | 372 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | { |
| 117 | 117 | foreach (['auth_url', 'region', 'username', 'password', 'container_name'] as $option) { |
| 118 | 118 | if (!Arr::isSetAndNotEmptyString($config, $option)) { |
| 119 | - throw new Exception($option . ' is mandatory'); |
|
| 119 | + throw new Exception($option.' is mandatory'); |
|
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | } |
@@ -179,11 +179,11 @@ discard block |
||
| 179 | 179 | public function simulate(Target $target, Result $result) |
| 180 | 180 | { |
| 181 | 181 | $result->debug( |
| 182 | - 'sync backup to OpenStack' . PHP_EOL |
|
| 183 | - . ' region: ' . $this->region . PHP_EOL |
|
| 184 | - . ' key: ' . $this->username . PHP_EOL |
|
| 185 | - . ' password: ********' . PHP_EOL |
|
| 186 | - . ' container: ' . $this->containerName |
|
| 182 | + 'sync backup to OpenStack'.PHP_EOL |
|
| 183 | + . ' region: '.$this->region.PHP_EOL |
|
| 184 | + . ' key: '.$this->username.PHP_EOL |
|
| 185 | + . ' password: ********'.PHP_EOL |
|
| 186 | + . ' container: '.$this->containerName |
|
| 187 | 187 | ); |
| 188 | 188 | } |
| 189 | 189 | |
@@ -209,6 +209,6 @@ discard block |
||
| 209 | 209 | */ |
| 210 | 210 | public function getUploadPath(Target $target) |
| 211 | 211 | { |
| 212 | - return $this->path . $target->getFilename(); |
|
| 212 | + return $this->path.$target->getFilename(); |
|
| 213 | 213 | } |
| 214 | 214 | } |