@@ -36,7 +36,7 @@ |
||
| 36 | 36 | foreach ($commands as $command) { |
| 37 | 37 | $command = trim($command); |
| 38 | 38 | if ($command) { |
| 39 | - passthru(($this->sudo ? 'sudo ' : '') . $command); |
|
| 39 | + passthru(($this->sudo ? 'sudo ' : '').$command); |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -15,6 +15,6 @@ |
||
| 15 | 15 | { |
| 16 | 16 | public function modify($command) |
| 17 | 17 | { |
| 18 | - return 'sudo ' . $command; |
|
| 18 | + return 'sudo '.$command; |
|
| 19 | 19 | } |
| 20 | 20 | } |
@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | if (!defined('HIDEV_VENDOR_DIR')) { |
| 13 | - foreach ([dirname(dirname(__DIR__)) . '/vendor', dirname(dirname(dirname(dirname(__DIR__))))] as $dir) { |
|
| 14 | - if (file_exists($dir . '/autoload.php')) { |
|
| 13 | + foreach ([dirname(dirname(__DIR__)).'/vendor', dirname(dirname(dirname(dirname(__DIR__))))] as $dir) { |
|
| 14 | + if (file_exists($dir.'/autoload.php')) { |
|
| 15 | 15 | define('HIDEV_VENDOR_DIR', $dir); |
| 16 | 16 | break; |
| 17 | 17 | } |
@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | exit(1); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - require HIDEV_VENDOR_DIR . '/autoload.php'; |
|
| 26 | - require HIDEV_VENDOR_DIR . '/yiisoft/yii2/Yii.php'; |
|
| 25 | + require HIDEV_VENDOR_DIR.'/autoload.php'; |
|
| 26 | + require HIDEV_VENDOR_DIR.'/yiisoft/yii2/Yii.php'; |
|
| 27 | 27 | |
| 28 | 28 | Yii::setAlias('@hidev', dirname(__DIR__)); |
| 29 | 29 | } |
@@ -19,11 +19,17 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | class Helper |
| 21 | 21 | { |
| 22 | + /** |
|
| 23 | + * @return string |
|
| 24 | + */ |
|
| 22 | 25 | public static function bad2sep($str, $separator = '-') |
| 23 | 26 | { |
| 24 | 27 | return preg_replace('/[^a-zA-Z0-9-]/', $separator, $str); |
| 25 | 28 | } |
| 26 | 29 | |
| 30 | + /** |
|
| 31 | + * @param string $id |
|
| 32 | + */ |
|
| 27 | 33 | public static function id2camel($id, $separator = '-') |
| 28 | 34 | { |
| 29 | 35 | return Inflector::id2camel(self::bad2sep($id, $separator), $separator); |
@@ -35,6 +41,9 @@ discard block |
||
| 35 | 41 | return str_replace('--', '-', Inflector::camel2id(str_replace(' ', '', ucwords($name)), $separator, $strict)); |
| 36 | 42 | } |
| 37 | 43 | |
| 44 | + /** |
|
| 45 | + * @param string $file |
|
| 46 | + */ |
|
| 38 | 47 | public static function file2template($file, $separator = '-') |
| 39 | 48 | { |
| 40 | 49 | return trim($file, '.'); |
@@ -70,6 +79,9 @@ discard block |
||
| 70 | 79 | return array_combine($res, $res); |
| 71 | 80 | } |
| 72 | 81 | |
| 82 | + /** |
|
| 83 | + * @param string $subj |
|
| 84 | + */ |
|
| 73 | 85 | public static function getPublicVars($subj) |
| 74 | 86 | { |
| 75 | 87 | return is_object($subj) ? get_object_vars($subj) : get_class_vars($subj); |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | 'name' => 'HiDev', |
| 15 | 15 | 'basePath' => dirname(__DIR__), |
| 16 | 16 | 'vendorPath' => HIDEV_VENDOR_DIR, |
| 17 | - 'runtimePath' => substr(__DIR__, 0, 7) === 'phar://' ? dirname($_SERVER['SCRIPT_NAME']) : dirname(HIDEV_VENDOR_DIR) . '/runtime', |
|
| 17 | + 'runtimePath' => substr(__DIR__, 0, 7) === 'phar://' ? dirname($_SERVER['SCRIPT_NAME']) : dirname(HIDEV_VENDOR_DIR).'/runtime', |
|
| 18 | 18 | 'enableCoreCommands' => false, |
| 19 | 19 | 'controllerNamespace' => 'hidev\\controllers', |
| 20 | 20 | 'defaultRoute' => 'default', |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | |
| 52 | 52 | public function actionSave() |
| 53 | 53 | { |
| 54 | - $this->getFile()->write(implode(' ', [$this->version, $this->date, $this->time, $this->zone, $this->hash]) . "\n"); |
|
| 54 | + $this->getFile()->write(implode(' ', [$this->version, $this->date, $this->time, $this->zone, $this->hash])."\n"); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | public function setVersion($version = null) |
@@ -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 | |
@@ -46,16 +46,16 @@ discard block |
||
| 46 | 46 | { |
| 47 | 47 | $path = parent::detectCommand($path); |
| 48 | 48 | |
| 49 | - return is_executable($path) ? $path : '/usr/bin/env php ' . $path; |
|
| 49 | + return is_executable($path) ? $path : '/usr/bin/env php '.$path; |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | public function install() |
| 53 | 53 | { |
| 54 | 54 | if ($this->installer) { |
| 55 | - passthru('/usr/bin/env wget ' . escapeshellarg($this->installer) . ' -O- | /usr/bin/env php', $exitcode); |
|
| 55 | + passthru('/usr/bin/env wget '.escapeshellarg($this->installer).' -O- | /usr/bin/env php', $exitcode); |
|
| 56 | 56 | } elseif ($this->download) { |
| 57 | - $dest = Yii::getAlias('@root/' . $this->name . '.phar', false); |
|
| 58 | - passthru('/usr/bin/env wget ' . escapeshellarg($this->download) . ' -O ' . $dest, $exitcode); |
|
| 57 | + $dest = Yii::getAlias('@root/'.$this->name.'.phar', false); |
|
| 58 | + passthru('/usr/bin/env wget '.escapeshellarg($this->download).' -O '.$dest, $exitcode); |
|
| 59 | 59 | } else { |
| 60 | 60 | return parent::install(); |
| 61 | 61 | } |
@@ -65,6 +65,6 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | public function getVcsignore() |
| 67 | 67 | { |
| 68 | - return $this->name . '.phar'; |
|
| 68 | + return $this->name.'.phar'; |
|
| 69 | 69 | } |
| 70 | 70 | } |
@@ -143,6 +143,9 @@ discard block |
||
| 143 | 143 | return $type2extension[$type]; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | + /** |
|
| 147 | + * @param string $extension |
|
| 148 | + */ |
|
| 146 | 149 | public function getTypeByExtension($extension) |
| 147 | 150 | { |
| 148 | 151 | return isset(static::$_extension2type[$extension]) ? static::$_extension2type[$extension] : null; |
@@ -157,6 +160,9 @@ discard block |
||
| 157 | 160 | return ($this->goal ? $this->goal->fileType : null) ?: static::getTypeByExtension($this->_extension) ?: 'template'; |
| 158 | 161 | } |
| 159 | 162 | |
| 163 | + /** |
|
| 164 | + * @param string $path |
|
| 165 | + */ |
|
| 160 | 166 | public function setPath($path) |
| 161 | 167 | { |
| 162 | 168 | $path = Yii::getAlias($path); |
@@ -233,6 +239,9 @@ discard block |
||
| 233 | 239 | return $this->getHandler()->renderPath($this->getPath(), $this->data); |
| 234 | 240 | } |
| 235 | 241 | |
| 242 | + /** |
|
| 243 | + * @param string $content |
|
| 244 | + */ |
|
| 236 | 245 | public function write($content) |
| 237 | 246 | { |
| 238 | 247 | return $this->getHandler()->write($this->getPath(), $content); |
@@ -243,6 +252,9 @@ discard block |
||
| 243 | 252 | return $this->data = $this->getHandler()->parsePath($this->getPath(), $this->getMinimalPath()); |
| 244 | 253 | } |
| 245 | 254 | |
| 255 | + /** |
|
| 256 | + * @return string |
|
| 257 | + */ |
|
| 246 | 258 | public function read() |
| 247 | 259 | { |
| 248 | 260 | return $this->getHandler()->read($this->getPath()); |
@@ -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', |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | |
| 177 | 177 | public function setBasename($basename) |
| 178 | 178 | { |
| 179 | - $this->setPath($this->_dirname . '/' . $basename); |
|
| 179 | + $this->setPath($this->_dirname.'/'.$basename); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | public function getBasename() |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | public function setDirname($dirname) |
| 188 | 188 | { |
| 189 | - $this->setPath($dirname . '/' . $this->_basename); |
|
| 189 | + $this->setPath($dirname.'/'.$this->_basename); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | public function getDirname() |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | |
| 197 | 197 | public function setFilename($filename) |
| 198 | 198 | { |
| 199 | - $this->setPath($this->_dirname . '/' . $filename . '.' . $this->_extension); |
|
| 199 | + $this->setPath($this->_dirname.'/'.$filename.'.'.$this->_extension); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | public function getFilename() |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | public function setExtension($extension) |
| 208 | 208 | { |
| 209 | - $this->setPath($this->_dirname . '/' . $this->_filename . '.' . $extension); |
|
| 209 | + $this->setPath($this->_dirname.'/'.$this->_filename.'.'.$extension); |
|
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | public function getExtension() |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | { |
| 258 | 258 | if (!is_object($this->_handler)) { |
| 259 | 259 | $this->_handler = Yii::createObject([ |
| 260 | - 'class' => 'hidev\handlers\\' . $this->getCtype() . 'Handler', |
|
| 260 | + 'class' => 'hidev\handlers\\'.$this->getCtype().'Handler', |
|
| 261 | 261 | 'template' => $this->template, |
| 262 | 262 | 'goal' => $this->goal, |
| 263 | 263 | ]); |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | |
| 361 | 361 | public function chown($value) |
| 362 | 362 | { |
| 363 | - $ownergroup = $this->getOwner() . ':' . $this->getGroup(); |
|
| 363 | + $ownergroup = $this->getOwner().':'.$this->getGroup(); |
|
| 364 | 364 | if (in_array((string) $value, [$ownergroup, $this->getOwner(), $this->getUid()], true)) { |
| 365 | 365 | return; |
| 366 | 366 | } |