Completed
Push — master ( 0bff19...1b573a )
by Basil
02:06
created
core/console/commands/ThemeController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,6 @@
 block discarded – undo
7 7
 use luya\theme\ThemeConfig;
8 8
 use Yii;
9 9
 use yii\helpers\Console;
10
-use yii\helpers\Inflector;
11 10
 
12 11
 /**
13 12
  * Command to create a new LUYA theme.
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     
48 48
         $availableModules = implode(', ', array_column(Yii::$app->getFrontendModules(), 'id'));
49 49
         $themeLocation = $this->prompt("Enter the theme location where to generate (as path alias e.g. app, $availableModules):", ['default' => 'app']);
50
-        $themeLocation = '@' . ltrim($themeLocation, '@');
50
+        $themeLocation = '@'.ltrim($themeLocation, '@');
51 51
     
52 52
         preg_match("#^@[A-z]+#", $themeLocation, $newThemeLocation);
53 53
     
@@ -59,15 +59,15 @@  discard block
 block discarded – undo
59 59
             }
60 60
         }
61 61
         
62
-        $basePath = $themeLocation . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $themeName;
62
+        $basePath = $themeLocation.DIRECTORY_SEPARATOR.'themes'.DIRECTORY_SEPARATOR.$themeName;
63 63
         $themeFolder = Yii::getAlias($basePath);
64 64
     
65 65
         if (file_exists($themeFolder)) {
66
-            return $this->outputError("The folder " . $themeFolder . " exists already.");
66
+            return $this->outputError("The folder ".$themeFolder." exists already.");
67 67
         }
68 68
     
69
-        $this->outputInfo("Theme path alias: " . $basePath);
70
-        $this->outputInfo("Theme real path: " . $themeFolder);
69
+        $this->outputInfo("Theme path alias: ".$basePath);
70
+        $this->outputInfo("Theme real path: ".$themeFolder);
71 71
         if (!$this->confirm("Do you want continue?")) {
72 72
             return $this->outputError('Abort by user.');
73 73
         }
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
         ];
82 82
 
83 83
         foreach ($folders as $folder) {
84
-            FileHelper::createDirectory($themeFolder . DIRECTORY_SEPARATOR . $folder);
84
+            FileHelper::createDirectory($themeFolder.DIRECTORY_SEPARATOR.$folder);
85 85
         }
86 86
         
87 87
         $contents = [
88
-            $themeFolder. DIRECTORY_SEPARATOR . 'theme.json' => $this->renderJson($basePath, $themeName),
88
+            $themeFolder.DIRECTORY_SEPARATOR.'theme.json' => $this->renderJson($basePath, $themeName),
89 89
         ];
90 90
         
91 91
         foreach ($contents as $fileName => $content) {
Please login to merge, or discard this patch.
core/web/Bootstrap.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -2,8 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace luya\web;
4 4
 
5
-use Yii;
6
-use yii\base\InvalidConfigException;
7 5
 use yii\helpers\ArrayHelper;
8 6
 use luya\base\AdminModuleInterface;
9 7
 use luya\TagParser;
Please login to merge, or discard this patch.
core/theme/ThemeConfig.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,6 +140,6 @@
 block discarded – undo
140 140
      */
141 141
     public function getViewPath()
142 142
     {
143
-        return $this->getBasePath() . '/views';
143
+        return $this->getBasePath().'/views';
144 144
     }
145 145
 }
146 146
\ No newline at end of file
Please login to merge, or discard this patch.
core/base/Module.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace luya\base;
4 4
 
5
-use luya\theme\Theme;
6 5
 use Yii;
7 6
 use yii\base\InvalidConfigException;
8 7
 use luya\console\interfaces\ImportControllerInterface;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
core/theme/ThemeManager.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -53,18 +53,18 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
core/theme/Theme.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.