luyadev / luya

core/theme/ThemeManager.php

Spacing +3 added lines, -3 removed lines

@@ -104,10 +104,10 @@ 
             $dir = Yii::getAlias($themeDefinition);
             
             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)) {
                 $themeConfig = new ThemeConfig($themeDefinition);
                 $this->_themes[$themeDefinition] = $themeConfig;
@@ -127,7 +127,7 @@ 
         $themeDefinitions = [];
         
         foreach (scandir(Yii::getAlias('@app/themes')) as $dirPath) {
-            $themeDefinitions = array_merge($themeDefinitions, "@app/themes/" , basename($dirPath));
+            $themeDefinitions = array_merge($themeDefinitions, "@app/themes/", basename($dirPath));
         }
         
         foreach (Yii::$app->getPackageInstaller()->getConfigs() as $config) {

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace luya\theme;
 
 use luya\base\PackageConfig;
-use luya\helpers\Json;
 use Yii;
 use luya\Exception;
 use yii\base\InvalidConfigException;

core/console/commands/ThemeController.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
             $themeConfig->parentTheme = $this->prompt("Enter the base path (e.g. `@app/themes/blank`) of the parent theme:",
                 [
                     'default' => '@app/themes/blank',
-                    'validator' => function ($input, &$error) {
+                    'validator' => function($input, &$error) {
                         if (preg_match('/^[a-z]+$/', $input) === false) {
                             $error = 'The theme name must be only letter chars!';
                             return false;
@@ -85,13 +85,13 @@ 
             }
         }
         
-        $basePath = '@app' . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $themeName;
+        $basePath = '@app'.DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.$themeName;
         
-        $appModulesFolder = Yii::$app->basePath . DIRECTORY_SEPARATOR . 'themes';
-        $themeFolder = $appModulesFolder . DIRECTORY_SEPARATOR . $themeName;
+        $appModulesFolder = Yii::$app->basePath.DIRECTORY_SEPARATOR.'themes';
+        $themeFolder = $appModulesFolder.DIRECTORY_SEPARATOR.$themeName;
         
         if (file_exists($themeFolder)) {
-            return $this->outputError("The folder " . $themeFolder . " exists already.");
+            return $this->outputError("The folder ".$themeFolder." exists already.");
         }
         
         $folders = [
@@ -103,11 +103,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/theme/ThemeConfig.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
         
         $config = [];
         
-        $themeFile = Yii::getAlias($basePath . '/theme.json');
+        $themeFile = Yii::getAlias($basePath.'/theme.json');
         if (file_exists($themeFile)) {
             $config = Json::decode(file_get_contents($themeFile)) ?: [];
         }
@@ -92,7 +92,7 @@ 
     
     public function getViewPath(): string
     {
-        return $this->getBasePath() . '/views';
+        return $this->getBasePath().'/views';
     }