@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | $pos = strpos($viewPath, '/'); |
67 | - $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos) . '/views'); |
|
67 | + $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos).'/views'); |
|
68 | 68 | $this->pathMap[$rootPath] = $pathMap; |
69 | 69 | |
70 | 70 | $this->pathMap['@app/views'] = $pathMap; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | public function getLayoutPath() |
86 | 86 | { |
87 | - return $this->viewPath . '/' . self::LAYOUTS_PATH; |
|
87 | + return $this->viewPath.'/'.self::LAYOUTS_PATH; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | public function getConfig() |
@@ -140,6 +140,6 @@ |
||
140 | 140 | */ |
141 | 141 | public function getViewPath() |
142 | 142 | { |
143 | - return $this->getBasePath() . '/views'; |
|
143 | + return $this->getBasePath().'/views'; |
|
144 | 144 | } |
145 | 145 | } |
146 | 146 | \ No newline at end of file |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace luya\base; |
4 | 4 | |
5 | -use luya\theme\Theme; |
|
6 | 5 | use Yii; |
7 | 6 | use yii\base\InvalidConfigException; |
8 | 7 | use luya\console\interfaces\ImportControllerInterface; |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | */ |
208 | 208 | public function getLayoutPath() |
209 | 209 | { |
210 | - if (Yii::$app->themeManager->hasActiveTheme && $this->useAppLayoutPath){ |
|
210 | + if (Yii::$app->themeManager->hasActiveTheme && $this->useAppLayoutPath) { |
|
211 | 211 | $this->setLayoutPath(Yii::$app->themeManager->activeTheme->layoutPath); |
212 | 212 | } elseif ($this->useAppLayoutPath) { |
213 | 213 | $this->setLayoutPath('@app/views/'.$this->id.'/layouts'); |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | */ |
314 | 314 | public function getControllerPath() |
315 | 315 | { |
316 | - return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false); |
|
316 | + return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false); |
|
317 | 317 | } |
318 | 318 | |
319 | 319 | // STATIC METHODS |