@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: liu21st <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\view\driver; |
14 | 14 | |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | |
79 | 79 | // 模板不存在 抛出异常 |
80 | 80 | if (!is_file($template)) { |
81 | - throw new RuntimeException('template not exists:' . $template); |
|
81 | + throw new RuntimeException('template not exists:'.$template); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | $this->template = $template; |
85 | 85 | |
86 | 86 | // 记录视图信息 |
87 | 87 | $this->app->log |
88 | - ->record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]'); |
|
88 | + ->record('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]'); |
|
89 | 89 | |
90 | 90 | extract($data, EXTR_OVERWRITE); |
91 | 91 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $this->content = $content; |
105 | 105 | |
106 | 106 | extract($data, EXTR_OVERWRITE); |
107 | - eval('?>' . $this->content); |
|
107 | + eval('?>'.$this->content); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -129,10 +129,10 @@ discard block |
||
129 | 129 | $appName = isset($app) ? $app : $request->app(); |
130 | 130 | $view = $this->config['view_dir_name']; |
131 | 131 | |
132 | - if (is_dir($this->app->getAppPath() . $view)) { |
|
133 | - $path = isset($app) ? $this->app->getBasePath() . ($appName ? $appName . DIRECTORY_SEPARATOR : '') . $view . DIRECTORY_SEPARATOR : $this->app->getAppPath() . $view . DIRECTORY_SEPARATOR; |
|
132 | + if (is_dir($this->app->getAppPath().$view)) { |
|
133 | + $path = isset($app) ? $this->app->getBasePath().($appName ? $appName.DIRECTORY_SEPARATOR : '').$view.DIRECTORY_SEPARATOR : $this->app->getAppPath().$view.DIRECTORY_SEPARATOR; |
|
134 | 134 | } else { |
135 | - $path = $this->app->getRootPath() . $view . DIRECTORY_SEPARATOR . ($appName ? $appName . DIRECTORY_SEPARATOR : ''); |
|
135 | + $path = $this->app->getRootPath().$view.DIRECTORY_SEPARATOR.($appName ? $appName.DIRECTORY_SEPARATOR : ''); |
|
136 | 136 | } |
137 | 137 | } |
138 | 138 | |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | $controller = $request->controller(); |
144 | 144 | if (strpos($controller, '.')) { |
145 | 145 | $pos = strrpos($controller, '.'); |
146 | - $controller = substr($controller, 0, $pos) . '.' . Str::snake(substr($controller, $pos + 1)); |
|
146 | + $controller = substr($controller, 0, $pos).'.'.Str::snake(substr($controller, $pos + 1)); |
|
147 | 147 | } else { |
148 | 148 | $controller = Str::snake($controller); |
149 | 149 | } |
@@ -159,16 +159,16 @@ discard block |
||
159 | 159 | $template = Str::snake($request->action()); |
160 | 160 | } |
161 | 161 | |
162 | - $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template; |
|
162 | + $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template; |
|
163 | 163 | } elseif (false === strpos($template, $depr)) { |
164 | - $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template; |
|
164 | + $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template; |
|
165 | 165 | } |
166 | 166 | } |
167 | 167 | } else { |
168 | 168 | $template = str_replace(['/', ':'], $depr, substr($template, 1)); |
169 | 169 | } |
170 | 170 | |
171 | - return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.'); |
|
171 | + return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.'); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |