@@ -162,9 +162,9 @@ discard block |
||
| 162 | 162 | Yii::setAlias('@hidev', dirname(__DIR__)); |
| 163 | 163 | |
| 164 | 164 | $package = $this->goals['package']; |
| 165 | - $alias = isset($package['namespace']) ? strtr($package['namespace'], '\\', '/') : ''; |
|
| 166 | - if ($alias && !Yii::getAlias('@' . $alias, false)) { |
|
| 167 | - $srcdir = Yii::getAlias('@root/' . ($package['src'] ?: 'src')); |
|
| 165 | + $alias = isset($package['namespace']) ? strtr($package['namespace'], '\\', '/') : ''; |
|
| 166 | + if ($alias && !Yii::getAlias('@'.$alias, false)) { |
|
| 167 | + $srcdir = Yii::getAlias('@root/'.($package['src'] ?: 'src')); |
|
| 168 | 168 | Yii::setAlias($alias, $srcdir); |
| 169 | 169 | } |
| 170 | 170 | $aliases = $this->goals['aliases']; |
@@ -331,6 +331,6 @@ discard block |
||
| 331 | 331 | |
| 332 | 332 | public function buildRootPath($subpath) |
| 333 | 333 | { |
| 334 | - return $this->getRootDir() . DIRECTORY_SEPARATOR . $subpath; |
|
| 334 | + return $this->getRootDir().DIRECTORY_SEPARATOR.$subpath; |
|
| 335 | 335 | } |
| 336 | 336 | } |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | */ |
| 124 | 124 | protected static $_extension2type = [ |
| 125 | 125 | 'json' => 'json', |
| 126 | - 'yml' => 'yaml', /// first one is preferred |
|
| 126 | + 'yml' => 'yaml', /// first one is preferred |
|
| 127 | 127 | 'yaml' => 'yaml', |
| 128 | 128 | 'xml' => 'xml', |
| 129 | 129 | 'xml.dist' => 'xml', |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | { |
| 175 | 175 | $path = $this->getPath(); |
| 176 | 176 | if (strncmp($path, '/', 1)) { |
| 177 | - $path = getcwd() . '/' . $path; |
|
| 177 | + $path = getcwd().'/'.$path; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | return $path; |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | public function setBasename($basename) |
| 189 | 189 | { |
| 190 | - $this->setPath($this->_dirname . '/' . $basename); |
|
| 190 | + $this->setPath($this->_dirname.'/'.$basename); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | public function getBasename() |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | public function setDirname($dirname) |
| 199 | 199 | { |
| 200 | - $this->setPath($dirname . '/' . $this->_basename); |
|
| 200 | + $this->setPath($dirname.'/'.$this->_basename); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | public function getDirname() |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | |
| 208 | 208 | public function setFilename($filename) |
| 209 | 209 | { |
| 210 | - $this->setPath($this->_dirname . '/' . $filename . '.' . $this->_extension); |
|
| 210 | + $this->setPath($this->_dirname.'/'.$filename.'.'.$this->_extension); |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | public function getFilename() |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | public function setExtension($extension) |
| 219 | 219 | { |
| 220 | - $this->setPath($this->_dirname . '/' . $this->_filename . '.' . $extension); |
|
| 220 | + $this->setPath($this->_dirname.'/'.$this->_filename.'.'.$extension); |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | public function getExtension() |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | { |
| 269 | 269 | if (!is_object($this->_handler)) { |
| 270 | 270 | $this->_handler = Yii::createObject([ |
| 271 | - 'class' => 'hidev\handlers\\' . $this->getCtype() . 'Handler', |
|
| 271 | + 'class' => 'hidev\handlers\\'.$this->getCtype().'Handler', |
|
| 272 | 272 | 'template' => $this->template, |
| 273 | 273 | 'goal' => $this->goal, |
| 274 | 274 | ]); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | |
| 372 | 372 | public function chown($value) |
| 373 | 373 | { |
| 374 | - $ownergroup = $this->getOwner() . ':' . $this->getGroup(); |
|
| 374 | + $ownergroup = $this->getOwner().':'.$this->getGroup(); |
|
| 375 | 375 | if (in_array((string) $value, [$ownergroup, $this->getOwner(), $this->getUid()], true)) { |
| 376 | 376 | return; |
| 377 | 377 | } |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | |
| 90 | 90 | public function save() |
| 91 | 91 | { |
| 92 | - $this->getFile()->write($this->renderFile() . "\n"); |
|
| 92 | + $this->getFile()->write($this->renderFile()."\n"); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | public function setRelease($release = null, $branch = '') |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | $this->interpolateArray($item); |
| 35 | 35 | } |
| 36 | 36 | } elseif (is_string($data)) { |
| 37 | - $data = preg_replace_callback('/\\$(\\w+)\\[\'(.+?)\'\\]/', function ($matches) { |
|
| 37 | + $data = preg_replace_callback('/\\$(\\w+)\\[\'(.+?)\'\\]/', function($matches) { |
|
| 38 | 38 | return $this->get($matches[1], $matches[2]); |
| 39 | 39 | }, $data); |
| 40 | 40 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | foreach ($this->getCommands() as $command) { |
| 46 | 46 | $command = trim($command); |
| 47 | 47 | if ($command) { |
| 48 | - passthru(($this->sudo ? 'sudo ' : '') . $command); |
|
| 48 | + passthru(($this->sudo ? 'sudo ' : '').$command); |
|
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | $this->after(); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $version->load(); |
| 30 | 30 | $version->setRelease($release); |
| 31 | 31 | $dir = dirname($version->getAbspath()); |
| 32 | - echo $version->renderFile() . PHP_EOL; |
|
| 32 | + echo $version->renderFile().PHP_EOL; |
|
| 33 | 33 | echo "(run from $dir)\n"; |
| 34 | 34 | } |
| 35 | 35 | |
@@ -44,6 +44,6 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | public function getComponent() |
| 46 | 46 | { |
| 47 | - return $this->take(($this->own ? 'own.' : '') . 'version'); |
|
| 47 | + return $this->take(($this->own ? 'own.' : '').'version'); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | $this->package = $package; |
| 50 | 50 | } |
| 51 | 51 | if (!$this->package || !$this->vendor) { |
| 52 | - throw new InvalidParamException('Wrong vendor/package given: ' . $name); |
|
| 52 | + throw new InvalidParamException('Wrong vendor/package given: '.$name); |
|
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $type = isset($config['template']) || isset($config['copy']) ? 'File' : 'Directory'; |
| 27 | 27 | $defaults = [ |
| 28 | 28 | 'class' => "hidev\\components\\$type", |
| 29 | - 'path' => $this->_path . '/' . $id, |
|
| 29 | + 'path' => $this->_path.'/'.$id, |
|
| 30 | 30 | ]; |
| 31 | 31 | $config = array_merge($defaults, $config ?: []); |
| 32 | 32 | $object = Yii::createObject($config); |
@@ -144,11 +144,11 @@ |
||
| 144 | 144 | public function read($path, $asArray = false) |
| 145 | 145 | { |
| 146 | 146 | if (file_exists($path)) { |
| 147 | - Yii::info('Read file: ' . $path, 'file'); |
|
| 147 | + Yii::info('Read file: '.$path, 'file'); |
|
| 148 | 148 | |
| 149 | 149 | return $asArray ? file($path) : file_get_contents($path); |
| 150 | 150 | } else { |
| 151 | - Yii::warning('Couldn\'t read file: ' . $path, 'file'); |
|
| 151 | + Yii::warning('Couldn\'t read file: '.$path, 'file'); |
|
| 152 | 152 | |
| 153 | 153 | return; |
| 154 | 154 | } |