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 +8 added lines, -8 removed lines

@@ -38,7 +38,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;
@@ -77,7 +77,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);
         if ($newThemeLocation[0] !== $themeLocation) {
@@ -88,15 +88,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.');
         }
@@ -110,11 +110,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/ThemeManager.php

Doc Comments +3 added lines

@@ -142,6 +142,9 @@
     }
     
     
+    /**
+     * @param string $basePath
+     */
     public function getThemeByBasePath($basePath)
     {
         $themes = $this->getThemes();

Spacing +3 added lines, -3 removed lines

@@ -47,10 +47,10 @@ 
         $dir = Yii::getAlias($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)) {
             $config = Json::decode(file_get_contents($themeFile)) ?: [];
         } else {
@@ -130,7 +130,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) {

core/theme/ThemeConfig.php

Spacing +1 added lines, -1 removed lines

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