@@ -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 | } |
@@ -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 | } |
@@ -146,7 +146,7 @@ |
||
| 146 | 146 | $result->debug($tar->getCmdPrintable()); |
| 147 | 147 | |
| 148 | 148 | if (!$tar->isSuccessful()) { |
| 149 | - throw new Exception('tar failed: ' . $tar->getStdErr()); |
|
| 149 | + throw new Exception('tar failed: '.$tar->getStdErr()); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | return $this->createStatus($target); |
@@ -260,7 +260,7 @@ |
||
| 260 | 260 | |
| 261 | 261 | $tar->addOptionIfNotEmpty('--force-local', $this->local, false); |
| 262 | 262 | $tar->addOptionIfNotEmpty('--use-compress-program', $this->compressProgram); |
| 263 | - $tar->addOption('-' . (empty($this->compressProgram) ? $this->compression : '') . $create); |
|
| 263 | + $tar->addOption('-'.(empty($this->compressProgram) ? $this->compression : '').$create); |
|
| 264 | 264 | |
| 265 | 265 | if ($this->isThrottled()) { |
| 266 | 266 | $pv = new Cmd('pv'); |