luyadev / luya

core/console/commands/ThemeController.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use luya\theme\ThemeConfig;
 use Yii;
 use yii\helpers\Console;
-use yii\helpers\Inflector;
 
 /**
  * Command to create a new LUYA theme.

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
     
         $availableModules = implode(', ', array_column(Yii::$app->getFrontendModules(), 'id'));
         $themeLocation = $this->prompt("Enter the theme location where to generate (as path alias e.g. app, $availableModules):", ['default' => 'app']);
-        $themeLocation = '@' . ltrim($themeLocation, '@');
+        $themeLocation = '@'.ltrim($themeLocation, '@');
     
         preg_match("#^@[A-z]+#", $themeLocation, $newThemeLocation);
     
@@ -59,15 +59,15 @@ 
             }
         }
         
-        $basePath = $themeLocation . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $themeName;
+        $basePath = $themeLocation.DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.$themeName;
         $themeFolder = Yii::getAlias($basePath);
     
         if (file_exists($themeFolder)) {
-            return $this->outputError("The folder " . $themeFolder . " exists already.");
+            return $this->outputError("The folder ".$themeFolder." exists already.");
         }
     
-        $this->outputInfo("Theme path alias: " . $basePath);
-        $this->outputInfo("Theme real path: " . $themeFolder);
+        $this->outputInfo("Theme path alias: ".$basePath);
+        $this->outputInfo("Theme real path: ".$themeFolder);
         if (!$this->confirm("Do you want continue?")) {
             return $this->outputError('Abort by user.');
         }
@@ -81,11 +81,11 @@ 
         ];
 
         foreach ($folders as $folder) {
-            FileHelper::createDirectory($themeFolder . DIRECTORY_SEPARATOR . $folder);
+            FileHelper::createDirectory($themeFolder.DIRECTORY_SEPARATOR.$folder);
         }
         
         $contents = [
-            $themeFolder. DIRECTORY_SEPARATOR . 'theme.json' => $this->renderJson($basePath, $themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'theme.json' => $this->renderJson($basePath, $themeName),
         ];
         
         foreach ($contents as $fileName => $content) {

core/web/Bootstrap.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace luya\web;
 
-use Yii;
-use yii\base\InvalidConfigException;
 use yii\helpers\ArrayHelper;
 use luya\base\AdminModuleInterface;
 use luya\TagParser;

core/theme/ThemeConfig.php

Spacing +1 added lines, -1 removed lines

@@ -140,6 +140,6 @@
      */
     public function getViewPath()
     {
-        return $this->getBasePath() . '/views';
+        return $this->getBasePath().'/views';
     }
 }
\ No newline at end of file

core/base/Module.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace luya\base;
 
-use luya\theme\Theme;
 use Yii;
 use yii\base\InvalidConfigException;
 use luya\console\interfaces\ImportControllerInterface;

Spacing +2 added lines, -2 removed lines

@@ -207,7 +207,7 @@ 
      */
     public function getLayoutPath()
     {
-        if (Yii::$app->themeManager->hasActiveTheme && $this->useAppLayoutPath){
+        if (Yii::$app->themeManager->hasActiveTheme && $this->useAppLayoutPath) {
             $this->setLayoutPath(Yii::$app->themeManager->activeTheme->layoutPath);
         } elseif ($this->useAppLayoutPath) {
             $this->setLayoutPath('@app/views/'.$this->id.'/layouts');
@@ -313,7 +313,7 @@ 
      */
     public function getControllerPath()
     {
-        return Yii::getAlias('@' . str_replace('\\', '/', $this->controllerNamespace), false);
+        return Yii::getAlias('@'.str_replace('\\', '/', $this->controllerNamespace), false);
     }
 
     // STATIC METHODS

core/theme/ThemeManager.php

Spacing +6 added lines, -6 removed lines

@@ -53,18 +53,18 @@ 
         if (strpos($basePath, '@') === 0) {
             $dir = Yii::getAlias($basePath);
         } elseif (strpos($basePath, '/') !== 0) {
-            $dir = $basePath = Yii::$app->basePath . DIRECTORY_SEPARATOR . $basePath;
+            $dir = $basePath = Yii::$app->basePath.DIRECTORY_SEPARATOR.$basePath;
         } else {
             $dir = $basePath;
         }
         
         if (!is_dir($dir) || !is_readable($dir)) {
-            throw new Exception('Theme directory not exists or readable: ' . $dir);
+            throw new Exception('Theme directory not exists or readable: '.$dir);
         }
         
-        $themeFile = $dir . '/theme.json';
+        $themeFile = $dir.'/theme.json';
         if (!file_exists($themeFile)) {
-            throw new InvalidConfigException('Theme config file missing at: ' . $themeFile);
+            throw new InvalidConfigException('Theme config file missing at: '.$themeFile);
         }
         
         $config = Json::decode(file_get_contents($themeFile)) ?: [];
@@ -159,7 +159,7 @@ 
         
         if (file_exists(Yii::getAlias('@app/themes'))) {
             foreach (glob(Yii::getAlias('@app/themes/*')) as $dirPath) {
-                $themeDefinitions[] = "@app/themes/" . basename($dirPath);
+                $themeDefinitions[] = "@app/themes/".basename($dirPath);
             }
         }
         
@@ -205,7 +205,7 @@ 
         
         $this->_themes[$basePath] = $themeConfig;
         
-        Yii::setAlias('@' . basename($basePath) . 'Theme', $basePath);
+        Yii::setAlias('@'.basename($basePath).'Theme', $basePath);
     }
     
     /**

core/theme/Theme.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
         }
     
         $pos = strpos($viewPath, '/');
-        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos) . '/views');
+        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos).'/views');
         $this->pathMap[$rootPath] = $pathMap;
     
         $this->pathMap['@app/views'] = $pathMap;
@@ -109,7 +109,7 @@ 
      */
     public function getLayoutPath()
     {
-        return $this->viewPath . '/' . self::LAYOUTS_PATH;
+        return $this->viewPath.'/'.self::LAYOUTS_PATH;
     }
     
     /**