View GitHub Repository luya

Schedule Inspection
Subscribe
Completed
Pull Request — master (#2002)
by Basil
02:50
created
Status
Category
Toggle Patches
core/theme/ThemeManager.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
             $dir = $basePath;
56 56 
         } else {
57 57 
             // relative path
58 
-            $dir = Yii::$app->basePath . DIRECTORY_SEPARATOR . $basePath;
58 
+            $dir = Yii::$app->basePath.DIRECTORY_SEPARATOR.$basePath;
59 59 
         }
60 60
61 61 
         // $basePath is an absolute path = /VENDOR/NAME/theme.json
 
@@ -65,12 +65,12 @@  discard block
 
 block discarded – undo
65 65 
             $basePath = pathinfo($basePath, PATHINFO_DIRNAME);
66 66 
         } else {
67 67 
             if (!is_dir($dir) || !is_readable($dir)) {
68 
-                throw new Exception('Theme directory not exists or readable: ' . $dir);
68 
+                throw new Exception('Theme directory not exists or readable: '.$dir);
69 69 
             }
70 70
71 
-            $themeFile = $dir . DIRECTORY_SEPARATOR . 'theme.json';
71 
+            $themeFile = $dir.DIRECTORY_SEPARATOR.'theme.json';
72 72 
             if (!file_exists($themeFile)) {
73 
-                throw new InvalidConfigException('Theme config file missing at: ' . $themeFile);
73 
+                throw new InvalidConfigException('Theme config file missing at: '.$themeFile);
74 74 
             }
75 75 
         }
76 76 
         
@@ -172,7 +172,7 @@  discard block
 
 block discarded – undo
172 172
173 173 
         if (file_exists(Yii::getAlias('@app/themes'))) {
174 174 
             foreach (glob(Yii::getAlias('@app/themes/*')) as $dirPath) {
175 
-                $themeDefinitions[] = "@app/themes/" . basename($dirPath);
175 
+                $themeDefinitions[] = "@app/themes/".basename($dirPath);
176 176 
             }
177 177 
         }
178 178 
         
@@ -218,7 +218,7 @@  discard block
 
 block discarded – undo
218 218
219 219 
         $this->_themes[$basePath] = $themeConfig;
220 220
221 
-        Yii::setAlias('@' . basename($basePath) . 'Theme', $basePath);
221 
+        Yii::setAlias('@'.basename($basePath).'Theme', $basePath);
222 222 
     }
223 223
224 224 
     /**
Please login to merge, or discard this patch.