@@ -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 |
@@ -53,18 +53,18 @@ discard block |
||
| 53 | 53 | if (strpos($basePath, '@') === 0) { |
| 54 | 54 | $dir = Yii::getAlias($basePath); |
| 55 | 55 | } elseif (strpos($basePath, '/') !== 0) { |
| 56 | - $dir = $basePath = Yii::$app->basePath . DIRECTORY_SEPARATOR . $basePath; |
|
| 56 | + $dir = $basePath = Yii::$app->basePath.DIRECTORY_SEPARATOR.$basePath; |
|
| 57 | 57 | } else { |
| 58 | 58 | $dir = $basePath; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | if (!is_dir($dir) || !is_readable($dir)) { |
| 62 | - throw new Exception('Theme directory not exists or readable: ' . $dir); |
|
| 62 | + throw new Exception('Theme directory not exists or readable: '.$dir); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - $themeFile = $dir . '/theme.json'; |
|
| 65 | + $themeFile = $dir.'/theme.json'; |
|
| 66 | 66 | if (!file_exists($themeFile)) { |
| 67 | - throw new InvalidConfigException('Theme config file missing at: ' . $themeFile); |
|
| 67 | + throw new InvalidConfigException('Theme config file missing at: '.$themeFile); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $config = Json::decode(file_get_contents($themeFile)) ?: []; |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | |
| 160 | 160 | if (file_exists(Yii::getAlias('@app/themes'))) { |
| 161 | 161 | foreach (glob(Yii::getAlias('@app/themes/*')) as $dirPath) { |
| 162 | - $themeDefinitions[] = "@app/themes/" . basename($dirPath); |
|
| 162 | + $themeDefinitions[] = "@app/themes/".basename($dirPath); |
|
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | |
| 206 | 206 | $this->_themes[$basePath] = $themeConfig; |
| 207 | 207 | |
| 208 | - Yii::setAlias('@' . basename($basePath) . 'Theme', $basePath); |
|
| 208 | + Yii::setAlias('@'.basename($basePath).'Theme', $basePath); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | /** |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $pos = strpos($viewPath, '/'); |
| 77 | - $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos) . '/views'); |
|
| 77 | + $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos).'/views'); |
|
| 78 | 78 | $this->pathMap[$rootPath] = $pathMap; |
| 79 | 79 | |
| 80 | 80 | $this->pathMap['@app/views'] = $pathMap; |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | */ |
| 110 | 110 | public function getLayoutPath() |
| 111 | 111 | { |
| 112 | - return $this->viewPath . '/' . self::LAYOUTS_PATH; |
|
| 112 | + return $this->viewPath.'/'.self::LAYOUTS_PATH; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |