@@ -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 | } |
@@ -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 | |
@@ -112,7 +112,7 @@ |
||
| 112 | 112 | { |
| 113 | 113 | // remove leading slash |
| 114 | 114 | return (substr($this->path, 0, 1) == '/' ? substr($this->path, 1) : $this->path) |
| 115 | - . (substr($this->path, -1, 1) == '/' ? '' : '/') |
|
| 116 | - . $target->getFilename(); |
|
| 115 | + . (substr($this->path, -1, 1) == '/' ? '' : '/') |
|
| 116 | + . $target->getFilename(); |
|
| 117 | 117 | } |
| 118 | 118 | } |
@@ -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 | } |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | $result->debug($rsync->getCmd()); |
| 51 | 51 | |
| 52 | 52 | if (!$rsync->wasSuccessful()) { |
| 53 | - throw new Exception('rsync failed:' . $rsync->getStdErr()); |
|
| 53 | + throw new Exception('rsync failed:'.$rsync->getStdErr()); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | return $this->createStatus($target); |
@@ -76,11 +76,11 @@ |
||
| 76 | 76 | ); |
| 77 | 77 | } else { |
| 78 | 78 | $this->executable->fromHost($this->host) |
| 79 | - ->fromUser($this->user) |
|
| 80 | - ->fromPath($this->path) |
|
| 81 | - ->toPath($this->getRsyncLocation($target, true)) |
|
| 82 | - ->removeDeleted($this->delete) |
|
| 83 | - ->exclude($this->excludes); |
|
| 79 | + ->fromUser($this->user) |
|
| 80 | + ->fromPath($this->path) |
|
| 81 | + ->toPath($this->getRsyncLocation($target, true)) |
|
| 82 | + ->removeDeleted($this->delete) |
|
| 83 | + ->exclude($this->excludes); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | return $this->executable; |