@@ -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 | } |
@@ -368,7 +368,7 @@ |
||
368 | 368 | -v, --verbose Output more verbose information. |
369 | 369 | -V, --version Output version information and exit. |
370 | 370 | |
371 | -EOT; |
|
371 | +eot; |
|
372 | 372 | if ($this->isPhar) { |
373 | 373 | echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL; |
374 | 374 | echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL; |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $ret = self::EXIT_EXCEPTION; |
98 | 98 | } |
99 | 99 | } catch (\Exception $e) { |
100 | - echo $e->getMessage() . PHP_EOL; |
|
100 | + echo $e->getMessage().PHP_EOL; |
|
101 | 101 | $ret = self::EXIT_EXCEPTION; |
102 | 102 | } |
103 | 103 | |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | { |
238 | 238 | $value = Arr::getValue($this->arguments, $arg); |
239 | 239 | if (!empty($value)) { |
240 | - $setter = 'set' . ucfirst($arg); |
|
240 | + $setter = 'set'.ucfirst($arg); |
|
241 | 241 | $configuration->{$setter}($value); |
242 | 242 | } |
243 | 243 | } |
@@ -252,21 +252,21 @@ discard block |
||
252 | 252 | // check if upgrade is necessary |
253 | 253 | $latestVersion = $this->getLatestVersion(); |
254 | 254 | if (!$this->isPharOutdated($latestVersion)) { |
255 | - echo 'You already have the latest version of phpbu installed.' . PHP_EOL; |
|
255 | + echo 'You already have the latest version of phpbu installed.'.PHP_EOL; |
|
256 | 256 | exit(self::EXIT_SUCCESS); |
257 | 257 | } |
258 | 258 | |
259 | 259 | $remoteFilename = 'http://phar.phpbu.de/phpbu.phar'; |
260 | 260 | $localFilename = realpath($_SERVER['argv'][0]); |
261 | - $tempFilename = basename($localFilename, '.phar') . '-temp.phar'; |
|
261 | + $tempFilename = basename($localFilename, '.phar').'-temp.phar'; |
|
262 | 262 | |
263 | - echo 'Updating the phpbu PHAR to version ' . $latestVersion . ' ... '; |
|
263 | + echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... '; |
|
264 | 264 | |
265 | 265 | $old = error_reporting(0); |
266 | 266 | $phar = file_get_contents($remoteFilename); |
267 | 267 | error_reporting($old); |
268 | 268 | if (!$phar) { |
269 | - echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL; |
|
269 | + echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL; |
|
270 | 270 | exit(self::EXIT_EXCEPTION); |
271 | 271 | } |
272 | 272 | file_put_contents($tempFilename, $phar); |
@@ -282,11 +282,11 @@ discard block |
||
282 | 282 | } catch (Exception $e) { |
283 | 283 | // cleanup crappy phar |
284 | 284 | unlink($tempFilename); |
285 | - echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL; |
|
285 | + echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL; |
|
286 | 286 | exit(self::EXIT_EXCEPTION); |
287 | 287 | } |
288 | 288 | |
289 | - echo 'done' . PHP_EOL; |
|
289 | + echo 'done'.PHP_EOL; |
|
290 | 290 | exit(self::EXIT_SUCCESS); |
291 | 291 | } |
292 | 292 | |
@@ -299,10 +299,10 @@ discard block |
||
299 | 299 | |
300 | 300 | $latestVersion = $this->getLatestVersion(); |
301 | 301 | if ($this->isPharOutdated($latestVersion)) { |
302 | - print 'You are not using the latest version of phpbu.' . PHP_EOL |
|
303 | - . 'Use "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL; |
|
302 | + print 'You are not using the latest version of phpbu.'.PHP_EOL |
|
303 | + . 'Use "phpbu --self-update" to install phpbu '.$latestVersion.PHP_EOL; |
|
304 | 304 | } else { |
305 | - print 'You are using the latest version of phpbu.' . PHP_EOL; |
|
305 | + print 'You are using the latest version of phpbu.'.PHP_EOL; |
|
306 | 306 | } |
307 | 307 | exit(self::EXIT_SUCCESS); |
308 | 308 | } |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu'); |
320 | 320 | error_reporting($old); |
321 | 321 | if (!$version) { |
322 | - echo 'Network-Error: Could not check latest version.' . PHP_EOL; |
|
322 | + echo 'Network-Error: Could not check latest version.'.PHP_EOL; |
|
323 | 323 | exit(self::EXIT_EXCEPTION); |
324 | 324 | } |
325 | 325 | return $version; |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | return; |
346 | 346 | } |
347 | 347 | |
348 | - echo Version::getVersionString() . PHP_EOL . PHP_EOL; |
|
348 | + echo Version::getVersionString().PHP_EOL.PHP_EOL; |
|
349 | 349 | $this->isVersionStringPrinted = true; |
350 | 350 | } |
351 | 351 | |
@@ -370,8 +370,8 @@ discard block |
||
370 | 370 | |
371 | 371 | EOT; |
372 | 372 | if ($this->isPhar) { |
373 | - echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL; |
|
374 | - echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL; |
|
373 | + echo ' --version-check Check whether phpbu is up to date.'.PHP_EOL; |
|
374 | + echo ' --self-update Upgrade 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 |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | public function __construct(bool $isPhar = false) |
55 | 55 | { |
56 | 56 | if ($isPhar) { |
57 | - $this->longOptions['self-update'] = true; |
|
57 | + $this->longOptions['self-update'] = true; |
|
58 | 58 | $this->longOptions['version-check'] = true; |
59 | 59 | } |
60 | 60 | } |
@@ -102,9 +102,9 @@ discard block |
||
102 | 102 | public function parseShortOption($arg, array &$options) |
103 | 103 | { |
104 | 104 | if (!isset($this->shortOptions[$arg])) { |
105 | - throw new Exception('unknown option: -' . $arg); |
|
105 | + throw new Exception('unknown option: -'.$arg); |
|
106 | 106 | } |
107 | - $options['-' . $arg] = true; |
|
107 | + $options['-'.$arg] = true; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -124,17 +124,17 @@ discard block |
||
124 | 124 | $argument = $list[1]; |
125 | 125 | } |
126 | 126 | if (count($list) > 2) { |
127 | - throw new Exception('invalid value for option: --' . $arg); |
|
127 | + throw new Exception('invalid value for option: --'.$arg); |
|
128 | 128 | } |
129 | - if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) { |
|
130 | - throw new Exception('unknown option: --' . $option); |
|
129 | + if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) { |
|
130 | + throw new Exception('unknown option: --'.$option); |
|
131 | 131 | } |
132 | - if ($argument === true && isset($this->longOptions[$option . '='])) { |
|
133 | - throw new Exception('argument required for option: --' . $option); |
|
132 | + if ($argument === true && isset($this->longOptions[$option.'='])) { |
|
133 | + throw new Exception('argument required for option: --'.$option); |
|
134 | 134 | } |
135 | 135 | if ($argument !== true && isset($this->longOptions[$option])) { |
136 | - throw new Exception('needless argument for option: --' . $option); |
|
136 | + throw new Exception('needless argument for option: --'.$option); |
|
137 | 137 | } |
138 | - $options['--' . $option] = $argument; |
|
138 | + $options['--'.$option] = $argument; |
|
139 | 139 | } |
140 | 140 | } |
@@ -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 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | "softlayer/objectstorage", |
31 | 31 | "vlucas/phpdotenv" |
32 | 32 | ])) { |
33 | - continue; |
|
33 | + continue; |
|
34 | 34 | } |
35 | 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)) { |
@@ -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 | } |