@@ -57,12 +57,12 @@ discard block |
||
57 | 57 | public function assemble() |
58 | 58 | { |
59 | 59 | $this->callback( |
60 | - function () { |
|
60 | + function() { |
|
61 | 61 | $scriptPath = $this->createScript(); |
62 | 62 | if ($webUrl = $this->get('webUrl')) { |
63 | 63 | $this->callScript($webUrl, $scriptPath); |
64 | 64 | } else { |
65 | - $this->scp($scriptPath, '{node}:{node.webRoot}/' . $scriptPath); |
|
65 | + $this->scp($scriptPath, '{node}:{node.webRoot}/'.$scriptPath); |
|
66 | 66 | foreach ($this->get('nodes') as $node) { |
67 | 67 | /* @var \Netresearch\Kite\Node $node */ |
68 | 68 | if ($webUrl = $node->get('webUrl', null)) { |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | */ |
84 | 84 | protected function createScript() |
85 | 85 | { |
86 | - $scriptPath = $this->get('baseDir') . '/ccc-' . uniqid() . '.php'; |
|
86 | + $scriptPath = $this->get('baseDir').'/ccc-'.uniqid().'.php'; |
|
87 | 87 | file_put_contents( |
88 | 88 | $scriptPath, |
89 | - '<?' . "php |
|
89 | + '<?'."php |
|
90 | 90 | if (function_exists('clearstatcache')) { |
91 | 91 | echo 'statcache|'; |
92 | 92 | clearstatcache(true); |
@@ -116,9 +116,9 @@ discard block |
||
116 | 116 | */ |
117 | 117 | protected function callScript($baseUrl, $scriptPath) |
118 | 118 | { |
119 | - $url = rtrim($baseUrl, '/') . '/' . ltrim($scriptPath, '/'); |
|
119 | + $url = rtrim($baseUrl, '/').'/'.ltrim($scriptPath, '/'); |
|
120 | 120 | |
121 | - $this->console->output('Calling ' . $url, OutputInterface::VERBOSITY_DEBUG); |
|
121 | + $this->console->output('Calling '.$url, OutputInterface::VERBOSITY_DEBUG); |
|
122 | 122 | $ch = curl_init(); |
123 | 123 | curl_setopt($ch, CURLOPT_URL, $url); |
124 | 124 | curl_setopt($ch, CURLOPT_HEADER, 1); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $this->console->outdent(); |
135 | 135 | } else { |
136 | 136 | if ($caches) { |
137 | - $this->console->output('Cleared code caches (' . implode(', ', $caches) . ')'); |
|
137 | + $this->console->output('Cleared code caches ('.implode(', ', $caches).')'); |
|
138 | 138 | } else { |
139 | 139 | $this->console->output('No code caches found'); |
140 | 140 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | public function assemble() |
132 | 132 | { |
133 | 133 | $this->callback( |
134 | - function () { |
|
134 | + function() { |
|
135 | 135 | $stages = $this->get('stages'); |
136 | 136 | $stageOptions = array(); |
137 | 137 | // Begin keys from 1 |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $task = clone $this->task; |
177 | 177 | foreach ($stages[$stage] as $key => $value) { |
178 | 178 | // Avoid variables overriding parent variables, by prefixing with this |
179 | - $task->set('this.' . $key, $value); |
|
179 | + $task->set('this.'.$key, $value); |
|
180 | 180 | } |
181 | 181 | $this->addTask($task); |
182 | 182 | } |
@@ -44,11 +44,11 @@ |
||
44 | 44 | $taskProperty = new \ReflectionProperty('Netresearch\\Kite\\Tasks', 'tasks'); |
45 | 45 | $taskProperty->setAccessible(true); |
46 | 46 | foreach ($taskProperty->getValue($task) as $subTask) { |
47 | - $description .= "\n\n" . $this->describeTask($subTask); |
|
47 | + $description .= "\n\n".$this->describeTask($subTask); |
|
48 | 48 | } |
49 | 49 | $description = trim($description); |
50 | 50 | if (!$description) { |
51 | - $description = 'Generic ' . $reflection->getName(); |
|
51 | + $description = 'Generic '.$reflection->getName(); |
|
52 | 52 | } |
53 | 53 | } elseif (preg_match_all('/^ \* ([^@ \n].+|)$/mU', $reflection->getDocComment(), $matches, PREG_PATTERN_ORDER)) { |
54 | 54 | $description = trim(implode("\n", $matches[1])); |
@@ -62,7 +62,7 @@ |
||
62 | 62 | */ |
63 | 63 | public function loadPreset($name) |
64 | 64 | { |
65 | - include dirname(dirname(__DIR__)) . '/presets/' . $name . '.php'; |
|
65 | + include dirname(dirname(__DIR__)).'/presets/'.$name.'.php'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -171,15 +171,15 @@ |
||
171 | 171 | $ucType = ucfirst($type); |
172 | 172 | if (!strpos($definition, '\\')) { |
173 | 173 | $taskClass = str_replace(' ', '\\', ucwords(str_replace('-', ' ', $definition))); |
174 | - $taskClass = $taskClass . ($postfixType ? $ucType : ''); |
|
174 | + $taskClass = $taskClass.($postfixType ? $ucType : ''); |
|
175 | 175 | foreach ($this->namespaces[$type] as $namespace) { |
176 | - $potentialClass = '\\' . $namespace . '\\' . $taskClass; |
|
176 | + $potentialClass = '\\'.$namespace.'\\'.$taskClass; |
|
177 | 177 | if (class_exists($potentialClass)) { |
178 | 178 | return $potentialClass; |
179 | 179 | } |
180 | 180 | } |
181 | - } elseif (!is_subclass_of(ltrim($definition, '\\'), 'Netresearch\\Kite\\' . $ucType)) { |
|
182 | - throw new Exception($definition .' must extend Netresearch\\Kite\\' . $ucType); |
|
181 | + } elseif (!is_subclass_of(ltrim($definition, '\\'), 'Netresearch\\Kite\\'.$ucType)) { |
|
182 | + throw new Exception($definition.' must extend Netresearch\\Kite\\'.$ucType); |
|
183 | 183 | } |
184 | 184 | return $definition; |
185 | 185 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | { |
85 | 85 | $dir = rtrim($dir, '/\\'); |
86 | 86 | |
87 | - return count(glob($dir . '/*') ?: array()) === 0 && count(glob($dir . '/.*') ?: array()) === 2; |
|
87 | + return count(glob($dir.'/*') ?: array()) === 0 && count(glob($dir.'/.*') ?: array()) === 2; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | } |
105 | 105 | |
106 | 106 | if (preg_match('{^(?:[a-z]:)?[/\\\\]+$}i', $directory)) { |
107 | - throw new \RuntimeException('Aborting an attempted deletion of ' . $directory . ', this was probably not intended, if it is a real use case please report it.'); |
|
107 | + throw new \RuntimeException('Aborting an attempted deletion of '.$directory.', this was probably not intended, if it is a real use case please report it.'); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | if (!function_exists('proc_open')) { |
@@ -161,12 +161,12 @@ discard block |
||
161 | 161 | if (!is_dir($directory)) { |
162 | 162 | if (file_exists($directory)) { |
163 | 163 | throw new \RuntimeException( |
164 | - $directory . ' exists and is not a directory.' |
|
164 | + $directory.' exists and is not a directory.' |
|
165 | 165 | ); |
166 | 166 | } |
167 | 167 | if (!@mkdir($directory, 0777, true)) { |
168 | 168 | throw new \RuntimeException( |
169 | - $directory . ' does not exist and could not be created.' |
|
169 | + $directory.' does not exist and could not be created.' |
|
170 | 170 | ); |
171 | 171 | } |
172 | 172 | } |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | $this->ensureDirectoryExists($target); |
208 | 208 | |
209 | 209 | foreach ($ri as $file) { |
210 | - $targetPath = $target . DIRECTORY_SEPARATOR . $ri->getSubPathName(); |
|
210 | + $targetPath = $target.DIRECTORY_SEPARATOR.$ri->getSubPathName(); |
|
211 | 211 | if ($file->isDir()) { |
212 | 212 | $this->ensureDirectoryExists($targetPath); |
213 | 213 | } else { |
@@ -293,11 +293,11 @@ discard block |
||
293 | 293 | } |
294 | 294 | |
295 | 295 | if (dirname($from) === dirname($to)) { |
296 | - return './' . basename($to); |
|
296 | + return './'.basename($to); |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | $commonPath = $to; |
300 | - while (strpos($from . '/', $commonPath . '/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath)) { |
|
300 | + while (strpos($from.'/', $commonPath.'/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath)) { |
|
301 | 301 | $commonPath = strtr(dirname($commonPath), '\\', '/'); |
302 | 302 | } |
303 | 303 | |
@@ -305,11 +305,11 @@ discard block |
||
305 | 305 | return $to; |
306 | 306 | } |
307 | 307 | |
308 | - $commonPath = rtrim($commonPath, '/') . '/'; |
|
308 | + $commonPath = rtrim($commonPath, '/').'/'; |
|
309 | 309 | $sourcePathDepth = substr_count(substr($from, strlen($commonPath)), '/'); |
310 | 310 | $commonPathCode = str_repeat('../', $sourcePathDepth); |
311 | 311 | |
312 | - return ($commonPathCode . substr($to, strlen($commonPath))) ?: './'; |
|
312 | + return ($commonPathCode.substr($to, strlen($commonPath))) ?: './'; |
|
313 | 313 | } |
314 | 314 | |
315 | 315 | /** |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | } |
338 | 338 | |
339 | 339 | $commonPath = $to; |
340 | - while (strpos($from . '/', $commonPath . '/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath) && '.' !== $commonPath) { |
|
340 | + while (strpos($from.'/', $commonPath.'/') !== 0 && '/' !== $commonPath && !preg_match('{^[a-z]:/?$}i', $commonPath) && '.' !== $commonPath) { |
|
341 | 341 | $commonPath = strtr(dirname($commonPath), '\\', '/'); |
342 | 342 | } |
343 | 343 | |
@@ -345,15 +345,15 @@ discard block |
||
345 | 345 | return var_export($to, true); |
346 | 346 | } |
347 | 347 | |
348 | - $commonPath = rtrim($commonPath, '/') . '/'; |
|
349 | - if (strpos($to, $from . '/') === 0) { |
|
350 | - return '__DIR__ . ' . var_export(substr($to, strlen($from)), true); |
|
348 | + $commonPath = rtrim($commonPath, '/').'/'; |
|
349 | + if (strpos($to, $from.'/') === 0) { |
|
350 | + return '__DIR__ . '.var_export(substr($to, strlen($from)), true); |
|
351 | 351 | } |
352 | 352 | $sourcePathDepth = substr_count(substr($from, strlen($commonPath)), '/') + $directories; |
353 | - $commonPathCode = str_repeat('dirname(', $sourcePathDepth) . '__DIR__' . str_repeat(')', $sourcePathDepth); |
|
353 | + $commonPathCode = str_repeat('dirname(', $sourcePathDepth).'__DIR__'.str_repeat(')', $sourcePathDepth); |
|
354 | 354 | $relTarget = substr($to, strlen($commonPath)); |
355 | 355 | |
356 | - return $commonPathCode . (strlen($relTarget) ? '.' . var_export('/' . $relTarget, true) : ''); |
|
356 | + return $commonPathCode.(strlen($relTarget) ? '.'.var_export('/'.$relTarget, true) : ''); |
|
357 | 357 | } |
358 | 358 | |
359 | 359 | /** |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | } |
427 | 427 | } |
428 | 428 | |
429 | - return $prefix . ($absolute ? '/' : '') . implode('/', $parts); |
|
429 | + return $prefix.($absolute ? '/' : '').implode('/', $parts); |
|
430 | 430 | } |
431 | 431 | |
432 | 432 | /** |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } elseif (is_array($command)) { |
67 | 67 | $command = implode('; ', $command); |
68 | 68 | } else { |
69 | - throw new \Netresearch\Kite\Exception('Command must be string or array, ' . gettype($command) . ' given.', 1312454906); |
|
69 | + throw new \Netresearch\Kite\Exception('Command must be string or array, '.gettype($command).' given.', 1312454906); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | parent::__construct($command, $cwd, null, null, null); |
@@ -141,14 +141,14 @@ discard block |
||
141 | 141 | { |
142 | 142 | $command = $this->getCommandLine(); |
143 | 143 | |
144 | - $this->console->output('<cmd>' . $this->getWorkingDirectory() . ' > ' . $command . '</cmd>', OutputInterface::VERBOSITY_VERBOSE); |
|
144 | + $this->console->output('<cmd>'.$this->getWorkingDirectory().' > '.$command.'</cmd>', OutputInterface::VERBOSITY_VERBOSE); |
|
145 | 145 | |
146 | 146 | if ($this->dryRun) { |
147 | 147 | return null; |
148 | 148 | } |
149 | 149 | |
150 | 150 | parent::run( |
151 | - function ($type, $buffer) use ($callback) { |
|
151 | + function($type, $buffer) use ($callback) { |
|
152 | 152 | if ($callback) { |
153 | 153 | call_user_func($callback, $type, $buffer); |
154 | 154 | } |
@@ -71,12 +71,12 @@ discard block |
||
71 | 71 | if (is_string($composerJson)) { |
72 | 72 | $path = realpath($composerJson); |
73 | 73 | if (!$path) { |
74 | - throw new Exception('Could not find ' . $composerJson); |
|
74 | + throw new Exception('Could not find '.$composerJson); |
|
75 | 75 | } |
76 | 76 | $this->path = dirname($path); |
77 | 77 | $composerJson = json_decode(file_get_contents($path)); |
78 | 78 | if (!is_object($composerJson)) { |
79 | - throw new Exception('Could not load ' . $path); |
|
79 | + throw new Exception('Could not load '.$path); |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | foreach (get_object_vars($composerJson) as $key => $value) { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $this->loadRemote(); |
105 | 105 | return $this->$name; |
106 | 106 | } |
107 | - throw new Exception('Invalid property ' . $name); |
|
107 | + throw new Exception('Invalid property '.$name); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -159,12 +159,12 @@ discard block |
||
159 | 159 | $this->upstreams = array(); |
160 | 160 | $this->branch = null; |
161 | 161 | $this->tag = null; |
162 | - $gitDir = $this->path . '/.git'; |
|
162 | + $gitDir = $this->path.'/.git'; |
|
163 | 163 | $this->git = file_exists($gitDir) && is_dir($gitDir); |
164 | 164 | if ($this->git) { |
165 | 165 | $this->composer->git('fetch', $this->path, array('p' => true, 'origin')); |
166 | 166 | try { |
167 | - $format = (self::$forEachRefHeadSupported ? '%(HEAD)' : '') . '|%(refname:short)|%(upstream:short)'; |
|
167 | + $format = (self::$forEachRefHeadSupported ? '%(HEAD)' : '').'|%(refname:short)|%(upstream:short)'; |
|
168 | 168 | $gitBr = $this->composer->git('for-each-ref', $this->path, ['format' => $format, 'refs/heads/', 'refs/remotes/origin']); |
169 | 169 | } catch (Exception\ProcessFailedException $e) { |
170 | 170 | if (trim($e->getProcess()->getErrorOutput()) === 'fatal: unknown field name: HEAD') { |
@@ -71,7 +71,7 @@ |
||
71 | 71 | public function offsetSet($name, $value) |
72 | 72 | { |
73 | 73 | if (in_array($name, ['workflow', 'script', 'task', 'tasks'], true)) { |
74 | - throw new Exception($name . ' not allowed on workflows'); |
|
74 | + throw new Exception($name.' not allowed on workflows'); |
|
75 | 75 | } |
76 | 76 | parent::offsetSet($name, $value); |
77 | 77 | } |