@@ -213,14 +213,14 @@ |
||
213 | 213 | if (file_exists($this->_baseYiiFile)) { |
214 | 214 | defined('LUYA_YII_VENDOR') ?: define('LUYA_YII_VENDOR', dirname($this->_baseYiiFile)); |
215 | 215 | |
216 | - $baseYiiFolder = LUYA_YII_VENDOR . DIRECTORY_SEPARATOR; |
|
217 | - $luyaYiiFile = $this->getCoreBasePath() . DIRECTORY_SEPARATOR . 'Yii.php'; |
|
216 | + $baseYiiFolder = LUYA_YII_VENDOR.DIRECTORY_SEPARATOR; |
|
217 | + $luyaYiiFile = $this->getCoreBasePath().DIRECTORY_SEPARATOR.'Yii.php'; |
|
218 | 218 | |
219 | 219 | if (file_exists($luyaYiiFile)) { |
220 | - require_once($baseYiiFolder . 'BaseYii.php'); |
|
220 | + require_once($baseYiiFolder.'BaseYii.php'); |
|
221 | 221 | require_once($luyaYiiFile); |
222 | 222 | } else { |
223 | - require_once($baseYiiFolder . 'Yii.php'); |
|
223 | + require_once($baseYiiFolder.'Yii.php'); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | Yii::setAlias('@luya', $this->getCoreBasePath()); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | public function isCli() |
71 | 71 | { |
72 | - return $this->getSapiName() === 'cli'; |
|
72 | + return $this->getSapiName() === 'cli'; |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -128,14 +128,14 @@ discard block |
||
128 | 128 | { |
129 | 129 | if ($this->_configArray === null) { |
130 | 130 | if (!file_exists($this->configFile)) { |
131 | - if (!$this->isCli()) { |
|
132 | - throw new Exception("Unable to load the config file '".$this->configFile."'."); |
|
133 | - } |
|
131 | + if (!$this->isCli()) { |
|
132 | + throw new Exception("Unable to load the config file '".$this->configFile."'."); |
|
133 | + } |
|
134 | 134 | |
135 | - $config = ['id' => 'consoleapp', 'basePath' => dirname(__DIR__)]; |
|
135 | + $config = ['id' => 'consoleapp', 'basePath' => dirname(__DIR__)]; |
|
136 | 136 | |
137 | 137 | } else { |
138 | - $config = require $this->configFile; |
|
138 | + $config = require $this->configFile; |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | if (!is_array($config)) { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | case 'en': |
105 | 105 | return 'en_US'; |
106 | 106 | default: |
107 | - return strtolower($lang) . '_' . strtoupper($lang); |
|
107 | + return strtolower($lang).'_'.strtoupper($lang); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | */ |
131 | 131 | public function getPackageInstaller() |
132 | 132 | { |
133 | - $file = Yii::getAlias('@vendor' . DIRECTORY_SEPARATOR . 'luyadev' . DIRECTORY_SEPARATOR . 'installer.php'); |
|
133 | + $file = Yii::getAlias('@vendor'.DIRECTORY_SEPARATOR.'luyadev'.DIRECTORY_SEPARATOR.'installer.php'); |
|
134 | 134 | |
135 | 135 | $data = []; |
136 | 136 | if (is_file($file)) { |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | public function getWebroot() |
163 | 163 | { |
164 | 164 | if ($this->_webroot === null) { |
165 | - $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory); |
|
165 | + $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | return $this->_webroot; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | { |
52 | 52 | $info = pathinfo($file); |
53 | 53 | if (!isset($info['extension']) || empty($info['extension'])) { |
54 | - $file = rtrim($file, '.') . '.' . $extension; |
|
54 | + $file = rtrim($file, '.').'.'.$extension; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | return $file; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | 'extension' => (isset($path['extension']) && !empty($path['extension'])) ? mb_strtolower($path['extension'], 'UTF-8') : false, |
116 | 116 | 'name' => (isset($path['filename']) && !empty($path['filename'])) ? $path['filename'] : false, |
117 | 117 | 'source' => $sourceFile, |
118 | - 'sourceFilename' => (isset($path['dirname']) && isset($path['filename'])) ? $path['dirname'] . DIRECTORY_SEPARATOR . $path['filename'] : false, |
|
118 | + 'sourceFilename' => (isset($path['dirname']) && isset($path['filename'])) ? $path['dirname'].DIRECTORY_SEPARATOR.$path['filename'] : false, |
|
119 | 119 | ]; |
120 | 120 | } |
121 | 121 |
@@ -113,7 +113,7 @@ |
||
113 | 113 | */ |
114 | 114 | public static function hashName($fileName) |
115 | 115 | { |
116 | - return sprintf('%s', hash('crc32b', uniqid($fileName, true))); |
|
116 | + return sprintf('%s', hash('crc32b', uniqid($fileName, true))); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |