@@ -9,17 +9,17 @@ |
||
| 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 | $packages = array_merge($lock->packages, $lock->{"packages-dev"}); |
| 18 | 18 | |
| 19 | 19 | foreach ($packages as $package) { |
| 20 | - echo $package->name . ': ' . $package->version; |
|
| 20 | + echo $package->name.': '.$package->version; |
|
| 21 | 21 | if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) { |
| 22 | - echo '@' . $package->source->reference; |
|
| 22 | + echo '@'.$package->source->reference; |
|
| 23 | 23 | } |
| 24 | 24 | echo PHP_EOL; |
| 25 | 25 | } |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | $replacements = array(); |
| 7 | 7 | |
| 8 | 8 | foreach ($patches as $file) { |
| 9 | - echo 'patching file: ' . $file['path'] . "..."; |
|
| 9 | + echo 'patching file: '.$file['path']."..."; |
|
| 10 | 10 | file_put_contents( |
| 11 | 11 | $file['path'], |
| 12 | 12 | str_replace( |
@@ -15,11 +15,11 @@ discard block |
||
| 15 | 15 | file_get_contents($file['path']) |
| 16 | 16 | ) |
| 17 | 17 | ); |
| 18 | - echo ' done' . PHP_EOL; |
|
| 18 | + echo ' done'.PHP_EOL; |
|
| 19 | 19 | }; |
| 20 | 20 | |
| 21 | 21 | foreach ($replacements as $file) { |
| 22 | - echo 'replacing file: ' . $file['path'] . "..."; |
|
| 22 | + echo 'replacing file: '.$file['path']."..."; |
|
| 23 | 23 | file_put_contents($file['path'], $file['content']); |
| 24 | - echo ' done' . PHP_EOL; |
|
| 24 | + echo ' done'.PHP_EOL; |
|
| 25 | 25 | } |
@@ -11,11 +11,11 @@ |
||
| 11 | 11 | } |
| 12 | 12 | |
| 13 | 13 | file_put_contents( |
| 14 | - __DIR__ . '/phar/Version.php', |
|
| 14 | + __DIR__.'/phar/Version.php', |
|
| 15 | 15 | str_replace( |
| 16 | 16 | 'private static $pharVersion;', |
| 17 | - 'private static $pharVersion = "' . $version . '";', |
|
| 18 | - file_get_contents(__DIR__ . '/phar/Version.php') |
|
| 17 | + 'private static $pharVersion = "'.$version.'";', |
|
| 18 | + file_get_contents(__DIR__.'/phar/Version.php') |
|
| 19 | 19 | ) |
| 20 | 20 | ); |
| 21 | 21 | |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | { |
| 63 | 63 | $s3->registerStreamWrapper(); |
| 64 | 64 | $source = $this->getFileHandle($target->getPathname(), 'r'); |
| 65 | - $stream = $this->getFileHandle('s3://' . $this->bucket . '/' . $this->getUploadPath($target), 'w'); |
|
| 66 | - while(!feof($source)) { |
|
| 65 | + $stream = $this->getFileHandle('s3://'.$this->bucket.'/'.$this->getUploadPath($target), 'w'); |
|
| 66 | + while (!feof($source)) { |
|
| 67 | 67 | fwrite($stream, fread($source, 4096)); |
| 68 | 68 | } |
| 69 | 69 | fclose($stream); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | { |
| 98 | 98 | $handle = fopen($path, $mode); |
| 99 | 99 | if (!is_resource($handle)) { |
| 100 | - throw new Exception('fopen failed: could not open stream ' . $path); |
|
| 100 | + throw new Exception('fopen failed: could not open stream '.$path); |
|
| 101 | 101 | } |
| 102 | 102 | return $handle; |
| 103 | 103 | } |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | if ($file->getPathname() == $this->target->getPathname()) { |
| 108 | 108 | continue; |
| 109 | 109 | } |
| 110 | - if (preg_match('#' . $this->fileRegex . '#i', $file->getFilename())) { |
|
| 111 | - $index = date('YmdHis', $file->getMTime()) . '-' . $i . '-' . $file->getPathname(); |
|
| 110 | + if (preg_match('#'.$this->fileRegex.'#i', $file->getFilename())) { |
|
| 111 | + $index = date('YmdHis', $file->getMTime()).'-'.$i.'-'.$file->getPathname(); |
|
| 112 | 112 | $this->files[$index] = new File($file->getFileInfo()); |
| 113 | 113 | } |
| 114 | 114 | } |
@@ -137,6 +137,6 @@ discard block |
||
| 137 | 137 | { |
| 138 | 138 | $dirTarget = Arr::getValue($this->target->getChangingPathElements(), $depth); |
| 139 | 139 | $dirRegex = Str::datePlaceholdersToRegex($dirTarget); |
| 140 | - return preg_match('#' . $dirRegex . '#i', $dir); |
|
| 140 | + return preg_match('#'.$dirRegex.'#i', $dir); |
|
| 141 | 141 | } |
| 142 | 142 | } |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | // check for mandatory options |
| 74 | 74 | foreach (['user', 'secret', 'container', 'host', 'path'] as $option) { |
| 75 | 75 | if (!Arr::isSetAndNotEmptyString($config, $option)) { |
| 76 | - throw new Exception('SoftLayer ' . $option . ' is mandatory'); |
|
| 76 | + throw new Exception('SoftLayer '.$option.' is mandatory'); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | |
@@ -97,19 +97,19 @@ discard block |
||
| 97 | 97 | public function sync(Target $target, Result $result) |
| 98 | 98 | { |
| 99 | 99 | $sourcePath = $target->getPathname(); |
| 100 | - $targetPath = $this->path . $target->getFilename(); |
|
| 100 | + $targetPath = $this->path.$target->getFilename(); |
|
| 101 | 101 | |
| 102 | 102 | $options = ['adapter' => ObjectStorage_Http_Client::SOCKET, 'timeout' => 20]; |
| 103 | 103 | $objectStorage = new ObjectStorage($this->host, $this->user, $this->secret, $options); |
| 104 | 104 | |
| 105 | - $result->debug('softlayer source: ' . $sourcePath); |
|
| 106 | - $result->debug('softlayer target: ' . $targetPath); |
|
| 105 | + $result->debug('softlayer source: '.$sourcePath); |
|
| 106 | + $result->debug('softlayer target: '.$targetPath); |
|
| 107 | 107 | |
| 108 | 108 | try { |
| 109 | 109 | /** @var \ObjectStorage_Container $container */ |
| 110 | - $container = $objectStorage->with($this->container . $targetPath) |
|
| 110 | + $container = $objectStorage->with($this->container.$targetPath) |
|
| 111 | 111 | ->setLocalFile($sourcePath) |
| 112 | - ->setMeta('description', 'PHPBU Backup: ' . date('r', time())) |
|
| 112 | + ->setMeta('description', 'PHPBU Backup: '.date('r', time())) |
|
| 113 | 113 | ->setHeader('Content-Type', $target->getMimeType()); |
| 114 | 114 | $container->create(); |
| 115 | 115 | } catch (\Exception $e) { |
@@ -128,12 +128,12 @@ discard block |
||
| 128 | 128 | public function simulate(Target $target, Result $result) |
| 129 | 129 | { |
| 130 | 130 | $result->debug( |
| 131 | - 'sync backup to SoftLayer' . PHP_EOL |
|
| 132 | - . ' host: ' . $this->host . PHP_EOL |
|
| 133 | - . ' user: ' . $this->user . PHP_EOL |
|
| 134 | - . ' secret: ********' . PHP_EOL |
|
| 135 | - . ' container: ' . $this->container . PHP_EOL |
|
| 136 | - . ' location: ' . $this->path |
|
| 131 | + 'sync backup to SoftLayer'.PHP_EOL |
|
| 132 | + . ' host: '.$this->host.PHP_EOL |
|
| 133 | + . ' user: '.$this->user.PHP_EOL |
|
| 134 | + . ' secret: ********'.PHP_EOL |
|
| 135 | + . ' container: '.$this->container.PHP_EOL |
|
| 136 | + . ' location: '.$this->path |
|
| 137 | 137 | ); |
| 138 | 138 | } |
| 139 | 139 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | // check for mandatory options |
| 102 | 102 | foreach (['key', 'secret', 'bucket', 'region', 'path'] as $option) { |
| 103 | 103 | if (!Arr::isSetAndNotEmptyString($config, $option)) { |
| 104 | - throw new Exception('AWS S3 ' . $option . ' is mandatory'); |
|
| 104 | + throw new Exception('AWS S3 '.$option.' is mandatory'); |
|
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
@@ -133,11 +133,11 @@ discard block |
||
| 133 | 133 | public function simulate(Target $target, Result $result) |
| 134 | 134 | { |
| 135 | 135 | $result->debug( |
| 136 | - 'sync backup to Amazon S3' . PHP_EOL |
|
| 137 | - . ' region: ' . $this->region . PHP_EOL |
|
| 138 | - . ' key: ' . $this->key . PHP_EOL |
|
| 139 | - . ' secret: ********' . PHP_EOL |
|
| 140 | - . ' location: ' . $this->bucket |
|
| 136 | + 'sync backup to Amazon S3'.PHP_EOL |
|
| 137 | + . ' region: '.$this->region.PHP_EOL |
|
| 138 | + . ' key: '.$this->key.PHP_EOL |
|
| 139 | + . ' secret: ********'.PHP_EOL |
|
| 140 | + . ' location: '.$this->bucket |
|
| 141 | 141 | ); |
| 142 | 142 | } |
| 143 | 143 | |
@@ -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 | } |
@@ -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 | /** |