@@ -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 | } |
@@ -302,7 +302,7 @@ |
||
302 | 302 | public function getFilenameSuffix($plain = false) |
303 | 303 | { |
304 | 304 | return (count($this->fileSuffixes) ? '.' . implode('.', $this->fileSuffixes) : '') |
305 | - . ($plain ? '' : $this->getCompressorSuffix() . $this->getCrypterSuffix()); |
|
305 | + . ($plain ? '' : $this->getCompressorSuffix() . $this->getCrypterSuffix()); |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | /** |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | $this->pathElementsChanging[] = $d; |
159 | 159 | $foundChangingElement = true; |
160 | 160 | } else { |
161 | - $this->pathNotChanging .= DIRECTORY_SEPARATOR . $d; |
|
161 | + $this->pathNotChanging .= DIRECTORY_SEPARATOR.$d; |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | // replace potential date placeholder |
@@ -301,8 +301,8 @@ discard block |
||
301 | 301 | */ |
302 | 302 | public function getFilenameSuffix($plain = false) |
303 | 303 | { |
304 | - return (count($this->fileSuffixes) ? '.' . implode('.', $this->fileSuffixes) : '') |
|
305 | - . ($plain ? '' : $this->getCompressorSuffix() . $this->getCrypterSuffix()); |
|
304 | + return (count($this->fileSuffixes) ? '.'.implode('.', $this->fileSuffixes) : '') |
|
305 | + . ($plain ? '' : $this->getCompressorSuffix().$this->getCrypterSuffix()); |
|
306 | 306 | } |
307 | 307 | |
308 | 308 | /** |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | */ |
313 | 313 | public function getCompressorSuffix() |
314 | 314 | { |
315 | - return $this->shouldBeCompressed() ? '.' . $this->compressor->getSuffix() : ''; |
|
315 | + return $this->shouldBeCompressed() ? '.'.$this->compressor->getSuffix() : ''; |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | /** |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | */ |
323 | 323 | public function getCrypterSuffix() |
324 | 324 | { |
325 | - return $this->shouldBeEncrypted() ? '.' . $this->crypter->getSuffix() : ''; |
|
325 | + return $this->shouldBeEncrypted() ? '.'.$this->crypter->getSuffix() : ''; |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | /** |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | */ |
413 | 413 | public function getPathname($plain = false) |
414 | 414 | { |
415 | - return $this->path . DIRECTORY_SEPARATOR . $this->getFilename($plain); |
|
415 | + return $this->path.DIRECTORY_SEPARATOR.$this->getFilename($plain); |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | /** |
@@ -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)) |
|
82 | - ->removeDeleted($this->delete) |
|
83 | - ->exclude($this->excludes); |
|
79 | + ->fromUser($this->user) |
|
80 | + ->fromPath($this->path) |
|
81 | + ->toPath($this->getRsyncLocation($target)) |
|
82 | + ->removeDeleted($this->delete) |
|
83 | + ->exclude($this->excludes); |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | return $this->executable; |
@@ -216,7 +216,7 @@ |
||
216 | 216 | } |
217 | 217 | |
218 | 218 | // use archive mode, verbose and compress if not already done |
219 | - $options = '-av' . ($this->compressed ? 'z' : ''); |
|
219 | + $options = '-av'.($this->compressed ? 'z' : ''); |
|
220 | 220 | $cmd->addOption($options); |
221 | 221 | |
222 | 222 | if (count($this->excludes)) { |
@@ -102,9 +102,9 @@ |
||
102 | 102 | if (null !== $this->host) { |
103 | 103 | // remote user |
104 | 104 | if (null !== $this->user) { |
105 | - $return .= $this->user . '@'; |
|
105 | + $return .= $this->user.'@'; |
|
106 | 106 | } |
107 | - $return .= $this->host . ':'; |
|
107 | + $return .= $this->host.':'; |
|
108 | 108 | } |
109 | 109 | $return .= $this->path; |
110 | 110 |
@@ -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 | } |