@@ -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); |
@@ -86,7 +86,6 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | 88 | * Load extra config files. |
| 89 | - * @param array $config |
|
| 90 | 89 | */ |
| 91 | 90 | public function loadExtraVendor($dir) |
| 92 | 91 | { |
@@ -185,8 +184,8 @@ discard block |
||
| 185 | 184 | |
| 186 | 185 | /** |
| 187 | 186 | * Run request. |
| 188 | - * @param string|array $query |
|
| 189 | - * @return Response |
|
| 187 | + * @param string $query |
|
| 188 | + * @return \yii\console\Response |
|
| 190 | 189 | */ |
| 191 | 190 | public function runRequest($query) |
| 192 | 191 | { |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | public static function readExtraVendor($dir) |
| 72 | 72 | { |
| 73 | - return static::readExtraConfig($dir . '/hiqdev/composer-config-plugin-output/hidev.php'); |
|
| 73 | + return static::readExtraConfig($dir.'/hiqdev/composer-config-plugin-output/hidev.php'); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | public static function readExtraConfig($path) |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | foreach (['params', 'aliases', 'modules', 'components'] as $key) { |
| 108 | 108 | if (isset($config[$key])) { |
| 109 | - $this->{'setExtra' . ucfirst($key)}($config[$key]); |
|
| 109 | + $this->{'setExtra'.ucfirst($key)}($config[$key]); |
|
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | |
@@ -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 | } |