@@ -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 |
@@ -141,10 +141,10 @@ |
||
141 | 141 | |
142 | 142 | $this->executable = new Executable\Tar($this->pathToTar); |
143 | 143 | $this->executable->archiveDirectory($this->path) |
144 | - ->useCompression($this->compression) |
|
145 | - ->ignoreFailedRead($this->ignoreFailedRead) |
|
146 | - ->removeSourceDirectory($this->removeSourceDir) |
|
147 | - ->archiveTo($this->pathToArchive); |
|
144 | + ->useCompression($this->compression) |
|
145 | + ->ignoreFailedRead($this->ignoreFailedRead) |
|
146 | + ->removeSourceDirectory($this->removeSourceDir) |
|
147 | + ->archiveTo($this->pathToArchive); |
|
148 | 148 | } |
149 | 149 | return $this->executable; |
150 | 150 | } |
@@ -109,7 +109,7 @@ |
||
109 | 109 | $result->debug($tar->getCmd()); |
110 | 110 | |
111 | 111 | if ($this->tarFailed($tar)) { |
112 | - throw new Exception('tar failed: ' . $tar->getStdErr()); |
|
112 | + throw new Exception('tar failed: '.$tar->getStdErr()); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | return $this->createStatus($target); |
@@ -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; |
@@ -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 | } |
@@ -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 |