luyadev / luya

core/console/commands/ThemeController.php

Spacing +14 added lines, -14 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;
-        $themeFolder = Yii::getAlias($themeLocation) . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $themeName;
+        $basePath = $themeLocation.DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.$themeName;
+        $themeFolder = Yii::getAlias($themeLocation).DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.$themeName;
         
         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,15 +81,15 @@ 
         ];
         
         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 . ucfirst($themeName) . 'Asset.php' => $this->renderAssetClass($themeName),
-            $themeFolder. DIRECTORY_SEPARATOR . 'resources'.DIRECTORY_SEPARATOR. $themeName .'.css' => '',
-            $themeFolder. DIRECTORY_SEPARATOR . 'views'.DIRECTORY_SEPARATOR.'layouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderLayout($themeName),
-            $themeFolder. DIRECTORY_SEPARATOR . 'views'.DIRECTORY_SEPARATOR.'cmslayouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderCmsLayout($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'theme.json' => $this->renderJson($basePath, $themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.ucfirst($themeName).'Asset.php' => $this->renderAssetClass($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'resources'.DIRECTORY_SEPARATOR.$themeName.'.css' => '',
+            $themeFolder.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'layouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderLayout($themeName),
+            $themeFolder.DIRECTORY_SEPARATOR.'views'.DIRECTORY_SEPARATOR.'cmslayouts'.DIRECTORY_SEPARATOR.'theme.php' => $this->renderCmsLayout($themeName),
         ];
         
         foreach ($contents as $fileName => $content) {
@@ -150,7 +150,7 @@ 
      */
     private function renderAssetClass($themeName)
     {
-        $className = ucfirst($themeName) . 'Asset';
+        $className = ucfirst($themeName).'Asset';
         return "<?php
 namespace app\\themes\\{$themeName};
 
@@ -171,7 +171,7 @@ 
      */
     private function renderLayout($themeName)
     {
-        $className = ucfirst($themeName) . 'Asset';
+        $className = ucfirst($themeName).'Asset';
     
         return '<?php
 /**