Completed
Pull Request — master (#1936)
by
unknown
01:54
created
core/theme/ThemeConfig.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\theme;
4 4
 
5
-use luya\helpers\FileHelper;
6 5
 use Yii;
7 6
 use luya\helpers\Json;
8 7
 use yii\base\BaseObject;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         $config = [];
31 31
         
32 32
         // @todo do not load the json every time
33
-        $themeFile = Yii::getAlias($basePath . '/theme.json');
33
+        $themeFile = Yii::getAlias($basePath.'/theme.json');
34 34
         if (file_exists($themeFile)) {
35 35
             $config = Json::decode(file_get_contents($themeFile)) ?: [];
36 36
         }
@@ -100,6 +100,6 @@  discard block
 block discarded – undo
100 100
     
101 101
     public function getViewPath(): string
102 102
     {
103
-        return $this->basePath . '/views';
103
+        return $this->basePath.'/views';
104 104
     }
105 105
 }
106 106
\ No newline at end of file
Please login to merge, or discard this patch.
core/theme/Theme.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     
52 52
         $viewPath = $this->getViewPath();
53 53
         $pos = strpos($viewPath, '/');
54
-        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos) . '/views');
54
+        $rootPath = $pos === false ? $viewPath : (substr($viewPath, 0, $pos).'/views');
55 55
         $this->pathMap[$rootPath] = $pathMap;
56 56
         
57 57
         $this->pathMap[$viewPath] = $pathMap;
@@ -72,17 +72,17 @@  discard block
 block discarded – undo
72 72
     
73 73
     public function getLayoutPath(): string
74 74
     {
75
-        return $this->viewPath . '/layouts';
75
+        return $this->viewPath.'/layouts';
76 76
     }
77 77
     
78 78
     public function getLayoutFile()
79 79
     {
80
-        return $this->layoutPath . '/' . $this->layout . '.php';
80
+        return $this->layoutPath.'/'.$this->layout.'.php';
81 81
     }
82 82
     
83 83
     public function getResourcePath()
84 84
     {
85
-        return $this->basePath . '/resources';
85
+        return $this->basePath.'/resources';
86 86
     }
87 87
     
88 88
     public function getInfo()
Please login to merge, or discard this patch.