Completed
Pull Request — master (#1960)
by Basil
02:17
created
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.
core/web/filters/RobotsFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@
 block discarded – undo
123 123
     {
124 124
         if (Yii::$app->request->isPost) {
125 125
             if ($this->getElapsedProcessTime() < $this->delay) {
126
-                throw new WhitelistedException("Robots Filter has detected an invalid Request: " . VarDumper::export(ArrayHelper::coverSensitiveValues(Yii::$app->request->post())));
126
+                throw new WhitelistedException("Robots Filter has detected an invalid Request: ".VarDumper::export(ArrayHelper::coverSensitiveValues(Yii::$app->request->post())));
127 127
             }
128 128
         }
129 129
         
Please login to merge, or discard this patch.