@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | /** |
234 | 234 | * Passthru command. |
235 | 235 | * @param string $command |
236 | - * @param array $args |
|
236 | + * @param string[] $args |
|
237 | 237 | * @return int exit code |
238 | 238 | */ |
239 | 239 | private function passthru($command, $args) |
@@ -299,6 +299,9 @@ discard block |
||
299 | 299 | } |
300 | 300 | } |
301 | 301 | |
302 | + /** |
|
303 | + * @param string $value |
|
304 | + */ |
|
302 | 305 | public function setRootDir($value) |
303 | 306 | { |
304 | 307 | $this->_rootDir = $value; |
@@ -330,6 +333,9 @@ discard block |
||
330 | 333 | throw new InvalidParamException("Not a hidev project (or any of the parent directories).\nUse `hidev init` to initialize hidev project."); |
331 | 334 | } |
332 | 335 | |
336 | + /** |
|
337 | + * @param string $subpath |
|
338 | + */ |
|
333 | 339 | public function buildRootPath($subpath) |
334 | 340 | { |
335 | 341 | return $this->getRootDir() . DIRECTORY_SEPARATOR . $subpath; |
@@ -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 | } |
@@ -18,11 +18,17 @@ |
||
18 | 18 | */ |
19 | 19 | class Helper |
20 | 20 | { |
21 | + /** |
|
22 | + * @return string |
|
23 | + */ |
|
21 | 24 | public static function bad2sep($str, $separator = '-') |
22 | 25 | { |
23 | 26 | return preg_replace('/[^a-zA-Z0-9-]/', $separator, $str); |
24 | 27 | } |
25 | 28 | |
29 | + /** |
|
30 | + * @param string $id |
|
31 | + */ |
|
26 | 32 | public static function id2camel($id, $separator = '-') |
27 | 33 | { |
28 | 34 | return Inflector::id2camel(self::bad2sep($id, $separator), $separator); |
@@ -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 | } |
@@ -103,6 +103,9 @@ |
||
103 | 103 | return $release ?: $this->release ?: 'dev'; |
104 | 104 | } |
105 | 105 | |
106 | + /** |
|
107 | + * @param string $branch |
|
108 | + */ |
|
106 | 109 | public function setBranch($branch, $release = null) |
107 | 110 | { |
108 | 111 | if (isset($branch) && $release !== 'dev') { |
@@ -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 = '') |
@@ -28,6 +28,9 @@ discard block |
||
28 | 28 | return $this->_view; |
29 | 29 | } |
30 | 30 | |
31 | + /** |
|
32 | + * @param string $id |
|
33 | + */ |
|
31 | 34 | public function take($id) |
32 | 35 | { |
33 | 36 | return $this->getApp()->get($id); |
@@ -43,7 +46,7 @@ discard block |
||
43 | 46 | * Command output passes unchanged to console. |
44 | 47 | * Returns exit code. |
45 | 48 | * @param string $name |
46 | - * @param array|string $args |
|
49 | + * @param string[] $args |
|
47 | 50 | * @return int exit code |
48 | 51 | */ |
49 | 52 | public function passthru($name, $args = []) |
@@ -28,7 +28,7 @@ |
||
28 | 28 | $type = isset($config['template']) || isset($config['copy']) ? 'ConfigFile' : 'Directory'; |
29 | 29 | $defaults = [ |
30 | 30 | 'class' => "hidev\\base\\$type", |
31 | - 'path' => $this->path . '/' . $id, |
|
31 | + 'path' => $this->path.'/'.$id, |
|
32 | 32 | ]; |
33 | 33 | $config = array_merge($defaults, $config ?: []); |
34 | 34 | $object = Yii::createObject($config); |
@@ -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 | } |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | define('HIDEV_VENDOR_DIR', dirname(dirname(dirname(dirname(__DIR__))))); |
13 | 13 | } |
14 | 14 | |
15 | -$runtimePath = (substr(__DIR__, 0, 7) === 'phar://' ? dirname($_SERVER['SCRIPT_NAME']) : dirname(HIDEV_VENDOR_DIR)) . '/.hidev/runtime'; |
|
15 | +$runtimePath = (substr(__DIR__, 0, 7) === 'phar://' ? dirname($_SERVER['SCRIPT_NAME']) : dirname(HIDEV_VENDOR_DIR)).'/.hidev/runtime'; |
|
16 | 16 | |
17 | 17 | return [ |
18 | 18 | 'id' => 'hidev', |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | ], |
89 | 89 | 'own.version' => [ |
90 | 90 | 'class' => \hidev\components\Version::class, |
91 | - 'file' => dirname(dirname(__DIR__)) . '/version', |
|
91 | + 'file' => dirname(dirname(__DIR__)).'/version', |
|
92 | 92 | ], |
93 | 93 | 'codeception' => [ |
94 | 94 | 'class' => \hidev\components\WTF::class, |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | ], |
112 | 112 | 'container' => [ |
113 | 113 | 'singletons' => [ |
114 | - \hidev\components\AbstractVcs::class => function () { |
|
114 | + \hidev\components\AbstractVcs::class => function() { |
|
115 | 115 | $detectedVCS = 'git'; |
116 | 116 | return Yii::$app->get($detectedVCS); |
117 | 117 | }, |