@@ -210,9 +210,9 @@ |
||
210 | 210 | if (file_exists($this->_baseYiiFile)) { |
211 | 211 | defined('LUYA_YII_VENDOR') ?: define('LUYA_YII_VENDOR', dirname($this->_baseYiiFile)); |
212 | 212 | |
213 | - $require = require_once(dirname($this->_baseYiiFile) . DIRECTORY_SEPARATOR . 'BaseYii.php'); |
|
213 | + $require = require_once(dirname($this->_baseYiiFile).DIRECTORY_SEPARATOR.'BaseYii.php'); |
|
214 | 214 | |
215 | - require_once($this->getCoreBasePath() . '/Yii.php'); |
|
215 | + require_once($this->getCoreBasePath().'/Yii.php'); |
|
216 | 216 | |
217 | 217 | Yii::setAlias('@luya', $this->getCoreBasePath()); |
218 | 218 | return $require; |
@@ -18,5 +18,5 @@ |
||
18 | 18 | } |
19 | 19 | |
20 | 20 | spl_autoload_register(['Yii', 'autoload'], true, true); |
21 | -Yii::$classMap = require(LUYA_YII_VENDOR . '/classes.php'); |
|
21 | +Yii::$classMap = require(LUYA_YII_VENDOR.'/classes.php'); |
|
22 | 22 | Yii::$container = new yii\di\Container(); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | case 'en': |
116 | 116 | return 'en_US'; |
117 | 117 | default: |
118 | - return strtolower($lang) . '_' . strtoupper($lang); |
|
118 | + return strtolower($lang).'_'.strtoupper($lang); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | public function getWebroot() |
146 | 146 | { |
147 | 147 | if ($this->_webroot === null) { |
148 | - $this->_webroot = realpath(realpath($this->basePath) . DIRECTORY_SEPARATOR . $this->webrootDirectory); |
|
148 | + $this->_webroot = realpath(realpath($this->basePath).DIRECTORY_SEPARATOR.$this->webrootDirectory); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | return $this->_webroot; |
@@ -36,15 +36,15 @@ |
||
36 | 36 | public function run($app) |
37 | 37 | { |
38 | 38 | foreach ($app->getApplicationModules() as $id => $module) { |
39 | - $folder = $module->basePath . DIRECTORY_SEPARATOR . 'commands'; |
|
39 | + $folder = $module->basePath.DIRECTORY_SEPARATOR.'commands'; |
|
40 | 40 | if (file_exists($folder) && is_dir($folder)) { |
41 | 41 | foreach (FileHelper::findFiles($folder) as $file) { |
42 | 42 | |
43 | - $module->controllerNamespace = $module->namespace . '\commands'; |
|
43 | + $module->controllerNamespace = $module->namespace.'\commands'; |
|
44 | 44 | |
45 | - $className = '\\'.$module->getNamespace().'\\commands\\' . pathinfo($file, PATHINFO_FILENAME); |
|
45 | + $className = '\\'.$module->getNamespace().'\\commands\\'.pathinfo($file, PATHINFO_FILENAME); |
|
46 | 46 | |
47 | - $command = str_replace('-controller', '', $module->id . '/' . Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME))); |
|
47 | + $command = str_replace('-controller', '', $module->id.'/'.Inflector::camel2id(pathinfo($file, PATHINFO_FILENAME))); |
|
48 | 48 | |
49 | 49 | Yii::$app->controllerMap[$command] = ['class' => $className]; |
50 | 50 | } |
@@ -278,6 +278,6 @@ |
||
278 | 278 | */ |
279 | 279 | public function getControllerPath() |
280 | 280 | { |
281 | - return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false); |
|
281 | + return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false); |
|
282 | 282 | } |
283 | 283 | } |
@@ -164,18 +164,18 @@ |
||
164 | 164 | } |
165 | 165 | |
166 | 166 | foreach ($this->getLog() as $section => $value) { |
167 | - $this->outputInfo(PHP_EOL . $section . ":"); |
|
167 | + $this->outputInfo(PHP_EOL.$section.":"); |
|
168 | 168 | foreach ($value as $k => $v) { |
169 | 169 | if (is_array($v)) { |
170 | 170 | foreach ($v as $kk => $kv) { |
171 | 171 | if (is_array($kv)) { |
172 | - $this->output(" - {$kk}: " . print_r($kv, true)); |
|
172 | + $this->output(" - {$kk}: ".print_r($kv, true)); |
|
173 | 173 | } else { |
174 | 174 | $this->output(" - {$kk}: {$kv}"); |
175 | 175 | } |
176 | 176 | } |
177 | 177 | } else { |
178 | - $this->output(" - " . $v); |
|
178 | + $this->output(" - ".$v); |
|
179 | 179 | } |
180 | 180 | } |
181 | 181 | } |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | |
206 | 206 | return [ |
207 | 207 | 'module' => $this->module->id, |
208 | - 'route' => $this->module->id . '/' . $request['route'], |
|
208 | + 'route' => $this->module->id.'/'.$request['route'], |
|
209 | 209 | 'params' => $request['args'], |
210 | 210 | ]; |
211 | 211 | } |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | throw new NotFoundHttpException(sprintf("Unable to create controller '%s' for module '%s'.", $requestRoute['route'], $this->module->id)); |
227 | 227 | } |
228 | 228 | |
229 | - Yii::info('LUYA module run module "'.$this->module->id.'" route ' . $requestRoute['route'], __METHOD__); |
|
229 | + Yii::info('LUYA module run module "'.$this->module->id.'" route '.$requestRoute['route'], __METHOD__); |
|
230 | 230 | |
231 | 231 | $this->controller = $controller[0]; |
232 | 232 |
@@ -262,7 +262,7 @@ |
||
262 | 262 | public function render($file, array $args = []) |
263 | 263 | { |
264 | 264 | $view = new View(); |
265 | - return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . FileHelper::ensureExtension($file, 'php'), $args); |
|
265 | + return $view->renderPhpFile(rtrim($this->getFolder(), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.FileHelper::ensureExtension($file, 'php'), $args); |
|
266 | 266 | |
267 | 267 | } |
268 | 268 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | { |
61 | 61 | if (Yii::$app->request->isPost) { |
62 | 62 | if ((time() - $this->getRenderTime()) < $this->delay) { |
63 | - throw new InvalidCallException("Robots Filter has detected an invalid Request: " . VarDumper::export(Yii::$app->request->post())); |
|
63 | + throw new InvalidCallException("Robots Filter has detected an invalid Request: ".VarDumper::export(Yii::$app->request->post())); |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 | } |