@@ -8,7 +8,7 @@ |
||
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\db\concern; |
14 | 14 |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | $app = $input->getArgument('app'); |
32 | 32 | |
33 | - if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) { |
|
33 | + if (empty($app) && !is_dir($this->app->getBasePath().'controller')) { |
|
34 | 34 | $output->writeln('<error>Miss app name!</error>'); |
35 | 35 | return false; |
36 | 36 | } |
@@ -47,21 +47,21 @@ discard block |
||
47 | 47 | protected function buildRoute(string $app = null): string |
48 | 48 | { |
49 | 49 | if ($app) { |
50 | - $path = $this->app->getBasePath() . $app . DIRECTORY_SEPARATOR; |
|
51 | - $namespace = 'app\\' . $app; |
|
50 | + $path = $this->app->getBasePath().$app.DIRECTORY_SEPARATOR; |
|
51 | + $namespace = 'app\\'.$app; |
|
52 | 52 | } else { |
53 | 53 | $path = $this->app->getBasePath(); |
54 | 54 | $namespace = 'app'; |
55 | 55 | } |
56 | 56 | |
57 | - $content = '<?php ' . PHP_EOL . '// 根据注解自动生成的路由规则' . PHP_EOL . 'use think\\facade\\Route;' . PHP_EOL; |
|
57 | + $content = '<?php '.PHP_EOL.'// 根据注解自动生成的路由规则'.PHP_EOL.'use think\\facade\\Route;'.PHP_EOL; |
|
58 | 58 | |
59 | 59 | $layer = $this->app->config->get('route.controller_layer'); |
60 | 60 | $suffix = $this->app->config->get('route.controller_suffix'); |
61 | 61 | |
62 | - $content .= $this->buildDirRoute($path . $layer . DIRECTORY_SEPARATOR, $namespace, $suffix, $layer); |
|
62 | + $content .= $this->buildDirRoute($path.$layer.DIRECTORY_SEPARATOR, $namespace, $suffix, $layer); |
|
63 | 63 | |
64 | - $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '') . 'build_route.php'; |
|
64 | + $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '').'build_route.php'; |
|
65 | 65 | |
66 | 66 | if (!file_exists($filename)) { |
67 | 67 | touch($filename); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | protected function buildDirRoute(string $path, string $namespace, bool $suffix, string $layer): string |
90 | 90 | { |
91 | 91 | $content = ''; |
92 | - $controllers = glob($path . '*.php'); |
|
92 | + $controllers = glob($path.'*.php'); |
|
93 | 93 | |
94 | 94 | foreach ($controllers as $controller) { |
95 | 95 | $controller = basename($controller, '.php'); |
@@ -99,21 +99,21 @@ discard block |
||
99 | 99 | $controller = substr($controller, 0, -10); |
100 | 100 | } |
101 | 101 | |
102 | - $class = new \ReflectionClass($namespace . '\\' . $layer . '\\' . $controller); |
|
102 | + $class = new \ReflectionClass($namespace.'\\'.$layer.'\\'.$controller); |
|
103 | 103 | |
104 | 104 | if (strpos($layer, '\\')) { |
105 | 105 | // 多级控制器 |
106 | 106 | $level = str_replace(DIRECTORY_SEPARATOR, '.', substr($layer, 11)); |
107 | - $controller = $level . '.' . $controller; |
|
107 | + $controller = $level.'.'.$controller; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | $content .= $this->getControllerRoute($class, $controller); |
111 | 111 | } |
112 | 112 | |
113 | - $subDir = glob($path . '*', GLOB_ONLYDIR); |
|
113 | + $subDir = glob($path.'*', GLOB_ONLYDIR); |
|
114 | 114 | |
115 | 115 | foreach ($subDir as $dir) { |
116 | - $content .= $this->buildDirRoute($dir . DIRECTORY_SEPARATOR, $namespace, $suffix, $layer . '\\' . basename($dir)); |
|
116 | + $content .= $this->buildDirRoute($dir.DIRECTORY_SEPARATOR, $namespace, $suffix, $layer.'\\'.basename($dir)); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | return $content; |
@@ -133,12 +133,12 @@ discard block |
||
133 | 133 | |
134 | 134 | if (false !== strpos($comment, '@route(')) { |
135 | 135 | $comment = $this->parseRouteComment($comment); |
136 | - $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\'' . $controller . '\')', $comment); |
|
137 | - $content .= PHP_EOL . $comment; |
|
136 | + $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\''.$controller.'\')', $comment); |
|
137 | + $content .= PHP_EOL.$comment; |
|
138 | 138 | } elseif (false !== strpos($comment, '@group(')) { |
139 | 139 | $comment = $this->parseRouteComment($comment, '@group('); |
140 | 140 | $comment = preg_replace('/group\(\s?([\'\"][\-\_\/\w]+[\'\"])\s?\)/is', 'Route::group(\1)', $comment); |
141 | - $content .= PHP_EOL . $comment; |
|
141 | + $content .= PHP_EOL.$comment; |
|
142 | 142 | preg_match('/group\(\s?[\'\"]([\-\_\/\w]+)[\'\"]\s?\)/is', $comment, $matches); |
143 | 143 | $group = $matches[1]; |
144 | 144 | } |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | foreach ($methods as $method) { |
149 | 149 | $comment = $this->getMethodRouteComment($controller, $method, $group ?? null); |
150 | 150 | if ($comment) { |
151 | - $content .= PHP_EOL . $comment; |
|
151 | + $content .= PHP_EOL.$comment; |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | { |
167 | 167 | $comment = substr($comment, 3, -2); |
168 | 168 | $comment = explode(PHP_EOL, substr(strstr(trim($comment), $tag), 1)); |
169 | - $comment = array_map(function ($item) { |
|
169 | + $comment = array_map(function($item) { |
|
170 | 170 | return trim(trim($item), ' \t*'); |
171 | 171 | }, $comment); |
172 | 172 | |
@@ -175,11 +175,11 @@ discard block |
||
175 | 175 | $comment = array_slice($comment, 0, false === $key ? 1 : $key); |
176 | 176 | } |
177 | 177 | |
178 | - $comment = implode(PHP_EOL . "\t", $comment) . ';'; |
|
178 | + $comment = implode(PHP_EOL."\t", $comment).';'; |
|
179 | 179 | |
180 | 180 | if (strpos($comment, '{')) { |
181 | - $comment = preg_replace_callback('/\{\s?.*?\s?\}/s', function ($matches) { |
|
182 | - return false !== strpos($matches[0], '"') ? '[' . substr(var_export(json_decode($matches[0], true), true), 7, -1) . ']' : $matches[0]; |
|
181 | + $comment = preg_replace_callback('/\{\s?.*?\s?\}/s', function($matches) { |
|
182 | + return false !== strpos($matches[0], '"') ? '['.substr(var_export(json_decode($matches[0], true), true), 7, -1).']' : $matches[0]; |
|
183 | 183 | }, $comment); |
184 | 184 | } |
185 | 185 | return $comment; |
@@ -200,15 +200,15 @@ discard block |
||
200 | 200 | if (false !== strpos($comment, '@route(')) { |
201 | 201 | $comment = $this->parseRouteComment($comment); |
202 | 202 | $action = $reflectMethod->getName(); |
203 | - $group = $group ? '->group(\'' . $group . '\')' : ''; |
|
203 | + $group = $group ? '->group(\''.$group.'\')' : ''; |
|
204 | 204 | |
205 | 205 | if ($suffix = $this->app->route->config('action_suffix')) { |
206 | 206 | $action = substr($action, 0, -strlen($suffix)); |
207 | 207 | } |
208 | 208 | |
209 | - $route = $controller . '/' . $action; |
|
210 | - $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\'' . $route . '\')' . $group, $comment); |
|
211 | - $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\'' . $route . '\')' . $group, $comment); |
|
209 | + $route = $controller.'/'.$action; |
|
210 | + $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\''.$route.'\')'.$group, $comment); |
|
211 | + $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\''.$route.'\')'.$group, $comment); |
|
212 | 212 | |
213 | 213 | return $comment; |
214 | 214 | } |
@@ -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; |
14 | 14 | |
@@ -175,9 +175,9 @@ discard block |
||
175 | 175 | $this->cache = $this->app->cache->store(true === $this->config['route_check_cache'] ? '' : $this->config['route_check_cache']); |
176 | 176 | } |
177 | 177 | |
178 | - if (is_file($this->app->getRuntimePath() . 'route.php')) { |
|
178 | + if (is_file($this->app->getRuntimePath().'route.php')) { |
|
179 | 179 | // 读取路由映射文件 |
180 | - $this->import(include $this->app->getRuntimePath() . 'route.php'); |
|
180 | + $this->import(include $this->app->getRuntimePath().'route.php'); |
|
181 | 181 | } |
182 | 182 | } |
183 | 183 | |
@@ -390,13 +390,13 @@ discard block |
||
390 | 390 | if (is_null($domain)) { |
391 | 391 | $domain = $this->host; |
392 | 392 | } elseif (false === strpos($domain, '.')) { |
393 | - $domain .= '.' . $this->request->rootDomain(); |
|
393 | + $domain .= '.'.$this->request->rootDomain(); |
|
394 | 394 | } |
395 | 395 | |
396 | 396 | $subDomain = $this->request->subDomain(); |
397 | 397 | |
398 | 398 | if (strpos($subDomain, '.')) { |
399 | - $name = '*' . strstr($subDomain, '.'); |
|
399 | + $name = '*'.strstr($subDomain, '.'); |
|
400 | 400 | } |
401 | 401 | |
402 | 402 | if (isset($this->bind[$domain])) { |
@@ -727,7 +727,7 @@ discard block |
||
727 | 727 | $this->init(); |
728 | 728 | |
729 | 729 | if ($withRoute) { |
730 | - $checkCallback = function () use ($request, $withRoute) { |
|
730 | + $checkCallback = function() use ($request, $withRoute) { |
|
731 | 731 | //加载路由 |
732 | 732 | $withRoute(); |
733 | 733 | return $this->check(); |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | |
747 | 747 | $dispatch->init($this->app); |
748 | 748 | |
749 | - $this->app->middleware->add(function () use ($dispatch) { |
|
749 | + $this->app->middleware->add(function() use ($dispatch) { |
|
750 | 750 | try { |
751 | 751 | $response = $dispatch->run(); |
752 | 752 | } catch (HttpResponseException $exception) { |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | $closure = $this->config['route_check_cache_key']; |
771 | 771 | $routeKey = $closure($request); |
772 | 772 | } else { |
773 | - $routeKey = md5($request->baseUrl(true) . ':' . $request->method()); |
|
773 | + $routeKey = md5($request->baseUrl(true).':'.$request->method()); |
|
774 | 774 | } |
775 | 775 | |
776 | 776 | return $routeKey; |
@@ -820,10 +820,10 @@ discard block |
||
820 | 820 | $path = $pathinfo; |
821 | 821 | } elseif ($suffix) { |
822 | 822 | // 去除正常的URL后缀 |
823 | - $path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo); |
|
823 | + $path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo); |
|
824 | 824 | } else { |
825 | 825 | // 允许任何后缀访问 |
826 | - $path = preg_replace('/\.' . $this->request->ext() . '$/i', '', $pathinfo); |
|
826 | + $path = preg_replace('/\.'.$this->request->ext().'$/i', '', $pathinfo); |
|
827 | 827 | } |
828 | 828 | |
829 | 829 | return $path; |
@@ -866,9 +866,9 @@ discard block |
||
866 | 866 | $item = $this->domains[$this->host]; |
867 | 867 | } elseif (isset($this->domains[$subDomain])) { |
868 | 868 | $item = $this->domains[$subDomain]; |
869 | - } elseif (isset($this->domains['*.' . $domain2]) && !empty($domain3)) { |
|
869 | + } elseif (isset($this->domains['*.'.$domain2]) && !empty($domain3)) { |
|
870 | 870 | // 泛三级域名 |
871 | - $item = $this->domains['*.' . $domain2]; |
|
871 | + $item = $this->domains['*.'.$domain2]; |
|
872 | 872 | $panDomain = $domain3; |
873 | 873 | } elseif (isset($this->domains['*']) && !empty($domain2)) { |
874 | 874 | // 泛二级域名 |
@@ -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\route; |
14 | 14 | |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | $rule = '/' != $rule ? ltrim($rule, '/') : ''; |
135 | 135 | |
136 | 136 | if ($this->parent && $prefix = $this->parent->getFullName()) { |
137 | - $rule = $prefix . ($rule ? '/' . ltrim($rule, '/') : ''); |
|
137 | + $rule = $prefix.($rule ? '/'.ltrim($rule, '/') : ''); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | if (false !== strpos($rule, ':')) { |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | |
238 | 238 | if (isset($option['ext'])) { |
239 | 239 | // 路由ext参数 优先于系统配置的URL伪静态后缀参数 |
240 | - $url = preg_replace('/\.(' . $request->ext() . ')$/i', '', $url); |
|
240 | + $url = preg_replace('/\.('.$request->ext().')$/i', '', $url); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | return $url; |
@@ -261,38 +261,38 @@ discard block |
||
261 | 261 | $pattern = array_merge($this->parent->getPattern(), $this->pattern); |
262 | 262 | |
263 | 263 | // 检查完整规则定义 |
264 | - if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . ($completeMatch ? '$' : '') . '/', str_replace('|', $depr, $url))) { |
|
264 | + if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^'.$pattern['__url__'].($completeMatch ? '$' : '').'/', str_replace('|', $depr, $url))) { |
|
265 | 265 | return false; |
266 | 266 | } |
267 | 267 | |
268 | 268 | $var = []; |
269 | - $url = $depr . str_replace('|', $depr, $url); |
|
270 | - $rule = $depr . str_replace('/', $depr, $this->rule); |
|
269 | + $url = $depr.str_replace('|', $depr, $url); |
|
270 | + $rule = $depr.str_replace('/', $depr, $this->rule); |
|
271 | 271 | |
272 | 272 | if ($depr == $rule && $depr != $url) { |
273 | 273 | return false; |
274 | 274 | } |
275 | 275 | |
276 | 276 | if (false === strpos($rule, '<')) { |
277 | - if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) { |
|
277 | + if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule.$depr, $url.$depr, strlen($rule.$depr)))) { |
|
278 | 278 | return $var; |
279 | 279 | } |
280 | 280 | return false; |
281 | 281 | } |
282 | 282 | |
283 | - $slash = preg_quote('/-' . $depr, '/'); |
|
283 | + $slash = preg_quote('/-'.$depr, '/'); |
|
284 | 284 | |
285 | - if ($matchRule = preg_split('/[' . $slash . ']?<\w+\??>/', $rule, 2)) { |
|
285 | + if ($matchRule = preg_split('/['.$slash.']?<\w+\??>/', $rule, 2)) { |
|
286 | 286 | if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) { |
287 | 287 | return false; |
288 | 288 | } |
289 | 289 | } |
290 | 290 | |
291 | - if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) { |
|
291 | + if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) { |
|
292 | 292 | $regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch); |
293 | 293 | |
294 | 294 | try { |
295 | - if (!preg_match('/^' . $regex . ($completeMatch ? '$' : '') . '/u', $url, $match)) { |
|
295 | + if (!preg_match('/^'.$regex.($completeMatch ? '$' : '').'/u', $url, $match)) { |
|
296 | 296 | return false; |
297 | 297 | } |
298 | 298 | } catch (\Exception $e) { |
@@ -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\route\dispatch; |
14 | 14 | |
@@ -68,15 +68,15 @@ discard block |
||
68 | 68 | // 实例化控制器 |
69 | 69 | $instance = $this->controller($this->controller); |
70 | 70 | } catch (ClassNotFoundException $e) { |
71 | - throw new HttpException(404, 'controller not exists:' . $e->getClass()); |
|
71 | + throw new HttpException(404, 'controller not exists:'.$e->getClass()); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | // 注册控制器中间件 |
75 | 75 | $this->registerControllerMiddleware($instance); |
76 | 76 | |
77 | - $this->app->middleware->controller(function (Request $request, $next) use ($instance) { |
|
77 | + $this->app->middleware->controller(function(Request $request, $next) use ($instance) { |
|
78 | 78 | // 获取当前操作名 |
79 | - $action = $this->actionName . $this->rule->config('action_suffix'); |
|
79 | + $action = $this->actionName.$this->rule->config('action_suffix'); |
|
80 | 80 | |
81 | 81 | if (is_callable([$instance, $action])) { |
82 | 82 | $vars = $this->request->param(); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | } else { |
94 | 94 | // 操作不存在 |
95 | - throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()'); |
|
95 | + throw new HttpException(404, 'method not exists:'.get_class($instance).'->'.$action.'()'); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | $data = $this->app->invokeReflectMethod($instance, $reflect, $vars); |
@@ -121,11 +121,11 @@ discard block |
||
121 | 121 | |
122 | 122 | foreach ($middlewares as $key => $val) { |
123 | 123 | if (!is_int($key)) { |
124 | - if (isset($val['only']) && !in_array($this->request->action(true), array_map(function ($item) { |
|
124 | + if (isset($val['only']) && !in_array($this->request->action(true), array_map(function($item) { |
|
125 | 125 | return strtolower($item); |
126 | 126 | }, $val['only']))) { |
127 | 127 | continue; |
128 | - } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function ($item) { |
|
128 | + } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function($item) { |
|
129 | 129 | return strtolower($item); |
130 | 130 | }, $val['except']))) { |
131 | 131 | continue; |
@@ -153,14 +153,14 @@ discard block |
||
153 | 153 | $controllerLayer = $this->rule->config('controller_layer') ?: 'controller'; |
154 | 154 | $emptyController = $this->rule->config('empty_controller') ?: 'Error'; |
155 | 155 | |
156 | - $class = $this->app->parseClass($controllerLayer, $name . $suffix); |
|
156 | + $class = $this->app->parseClass($controllerLayer, $name.$suffix); |
|
157 | 157 | |
158 | 158 | if (class_exists($class)) { |
159 | 159 | return $this->app->make($class, [], true); |
160 | - } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController . $suffix))) { |
|
160 | + } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController.$suffix))) { |
|
161 | 161 | return $this->app->make($emptyClass, [], true); |
162 | 162 | } |
163 | 163 | |
164 | - throw new ClassNotFoundException('class not exists:' . $class, $class); |
|
164 | + throw new ClassNotFoundException('class not exists:'.$class, $class); |
|
165 | 165 | } |
166 | 166 | } |
@@ -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\model\concern; |
14 | 14 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | public function setRelation(string $name, $value, array $data = []) |
114 | 114 | { |
115 | 115 | // 检测修改器 |
116 | - $method = 'set' . App::parseName($name, 1) . 'Attr'; |
|
116 | + $method = 'set'.App::parseName($name, 1).'Attr'; |
|
117 | 117 | |
118 | 118 | if (method_exists($this, $method)) { |
119 | 119 | $value = $this->$method($value, array_merge($this->data, $data)); |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $value = $this->getOrigin($key); |
313 | 313 | |
314 | 314 | if (!is_null($value)) { |
315 | - throw new Exception('bind attr has exists:' . $key); |
|
315 | + throw new Exception('bind attr has exists:'.$key); |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | $this->set($key, $relation ? $relation->$attr : null); |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | $count = $this->$relation()->relationCount($result, $closure, $aggregate, $field, $name); |
348 | 348 | |
349 | 349 | if (empty($name)) { |
350 | - $name = App::parseName($relation) . '_' . $aggregate; |
|
350 | + $name = App::parseName($relation).'_'.$aggregate; |
|
351 | 351 | } |
352 | 352 | |
353 | 353 | $result->setAttr($name, $count); |
@@ -467,8 +467,8 @@ discard block |
||
467 | 467 | // 记录当前关联信息 |
468 | 468 | $model = $this->parseModel($model); |
469 | 469 | $name = App::parseName(App::classBaseName($model)); |
470 | - $middle = $middle ?: App::parseName($this->name) . '_' . $name; |
|
471 | - $foreignKey = $foreignKey ?: $name . '_id'; |
|
470 | + $middle = $middle ?: App::parseName($this->name).'_'.$name; |
|
471 | + $foreignKey = $foreignKey ?: $name.'_id'; |
|
472 | 472 | $localKey = $localKey ?: $this->getForeignKey($this->name); |
473 | 473 | |
474 | 474 | return new BelongsToMany($this, $model, $middle, $foreignKey, $localKey); |
@@ -495,8 +495,8 @@ discard block |
||
495 | 495 | if (is_array($morph)) { |
496 | 496 | list($morphType, $foreignKey) = $morph; |
497 | 497 | } else { |
498 | - $morphType = $morph . '_type'; |
|
499 | - $foreignKey = $morph . '_id'; |
|
498 | + $morphType = $morph.'_type'; |
|
499 | + $foreignKey = $morph.'_id'; |
|
500 | 500 | } |
501 | 501 | |
502 | 502 | $type = $type ?: get_class($this); |
@@ -527,8 +527,8 @@ discard block |
||
527 | 527 | if (is_array($morph)) { |
528 | 528 | list($morphType, $foreignKey) = $morph; |
529 | 529 | } else { |
530 | - $morphType = $morph . '_type'; |
|
531 | - $foreignKey = $morph . '_id'; |
|
530 | + $morphType = $morph.'_type'; |
|
531 | + $foreignKey = $morph.'_id'; |
|
532 | 532 | } |
533 | 533 | |
534 | 534 | return new MorphMany($this, $model, $foreignKey, $morphType, $type); |
@@ -554,8 +554,8 @@ discard block |
||
554 | 554 | if (is_array($morph)) { |
555 | 555 | list($morphType, $foreignKey) = $morph; |
556 | 556 | } else { |
557 | - $morphType = $morph . '_type'; |
|
558 | - $foreignKey = $morph . '_id'; |
|
557 | + $morphType = $morph.'_type'; |
|
558 | + $foreignKey = $morph.'_id'; |
|
559 | 559 | } |
560 | 560 | |
561 | 561 | return new MorphTo($this, $morphType, $foreignKey, $alias, $relation); |
@@ -591,7 +591,7 @@ discard block |
||
591 | 591 | $name = App::classBaseName($name); |
592 | 592 | } |
593 | 593 | |
594 | - return App::parseName($name) . '_id'; |
|
594 | + return App::parseName($name).'_id'; |
|
595 | 595 | } |
596 | 596 | |
597 | 597 | /** |
@@ -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; |
14 | 14 | |
@@ -310,12 +310,12 @@ discard block |
||
310 | 310 | $query = $this->queryInstance; |
311 | 311 | } else { |
312 | 312 | $query = $this->db->buildQuery($this->connection) |
313 | - ->name($this->name . $this->suffix) |
|
313 | + ->name($this->name.$this->suffix) |
|
314 | 314 | ->pk($this->pk); |
315 | 315 | } |
316 | 316 | |
317 | 317 | if (!empty($this->table)) { |
318 | - $query->table($this->table . $this->suffix); |
|
318 | + $query->table($this->table.$this->suffix); |
|
319 | 319 | } |
320 | 320 | |
321 | 321 | $query->model($this) |
@@ -515,7 +515,7 @@ discard block |
||
515 | 515 | $this->field = array_keys(array_merge($this->schema, $this->jsonType)); |
516 | 516 | } else { |
517 | 517 | $query = $this->db(); |
518 | - $table = $this->table ? $this->table . $this->suffix : $query->getTable(); |
|
518 | + $table = $this->table ? $this->table.$this->suffix : $query->getTable(); |
|
519 | 519 | |
520 | 520 | $this->field = $query->getConnection()->getTableFields($table); |
521 | 521 | } |
@@ -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; |
14 | 14 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | return $this->make($abstract); |
172 | 172 | } |
173 | 173 | |
174 | - throw new ClassNotFoundException('class not exists: ' . $abstract, $abstract); |
|
174 | + throw new ClassNotFoundException('class not exists: '.$abstract, $abstract); |
|
175 | 175 | } |
176 | 176 | |
177 | 177 | /** |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | |
330 | 330 | return call_user_func_array($function, $args); |
331 | 331 | } catch (ReflectionException $e) { |
332 | - throw new Exception('function not exists: ' . $function . '()'); |
|
332 | + throw new Exception('function not exists: '.$function.'()'); |
|
333 | 333 | } |
334 | 334 | } |
335 | 335 | |
@@ -357,12 +357,12 @@ discard block |
||
357 | 357 | } catch (ReflectionException $e) { |
358 | 358 | if (is_array($method)) { |
359 | 359 | $class = is_object($method[0]) ? get_class($method[0]) : $method[0]; |
360 | - $callback = $class . '::' . $method[1]; |
|
360 | + $callback = $class.'::'.$method[1]; |
|
361 | 361 | } else { |
362 | 362 | $callback = $method; |
363 | 363 | } |
364 | 364 | |
365 | - throw new Exception('method not exists: ' . $callback . '()'); |
|
365 | + throw new Exception('method not exists: '.$callback.'()'); |
|
366 | 366 | } |
367 | 367 | } |
368 | 368 | |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | |
429 | 429 | return $object; |
430 | 430 | } catch (ReflectionException $e) { |
431 | - throw new ClassNotFoundException('class not exists: ' . $class, $class); |
|
431 | + throw new ClassNotFoundException('class not exists: '.$class, $class); |
|
432 | 432 | } |
433 | 433 | } |
434 | 434 | |
@@ -489,7 +489,7 @@ discard block |
||
489 | 489 | } elseif ($param->isDefaultValueAvailable()) { |
490 | 490 | $args[] = $param->getDefaultValue(); |
491 | 491 | } else { |
492 | - throw new InvalidArgumentException('method param miss:' . $name); |
|
492 | + throw new InvalidArgumentException('method param miss:'.$name); |
|
493 | 493 | } |
494 | 494 | } |
495 | 495 |
@@ -8,7 +8,7 @@ |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: yunwuxin <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think\filesystem\driver; |
14 | 14 |