@@ -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 | |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | return $this->make($abstract); |
131 | 131 | } |
132 | 132 | |
133 | - throw new ClassNotFoundException('class not exists: ' . $abstract, $abstract); |
|
133 | + throw new ClassNotFoundException('class not exists: '.$abstract, $abstract); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | $reflect = new ReflectionMethod($class, $method); |
316 | 316 | } catch (ReflectionException $e) { |
317 | 317 | $class = is_object($class) ? get_class($class) : $class; |
318 | - throw new FuncNotFoundException('method not exists: ' . $class . '::' . $method . '()', "{$class}::{$method}", $e); |
|
318 | + throw new FuncNotFoundException('method not exists: '.$class.'::'.$method.'()', "{$class}::{$method}", $e); |
|
319 | 319 | } |
320 | 320 | |
321 | 321 | $args = $this->bindParams($reflect, $vars); |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | try { |
374 | 374 | $reflect = new ReflectionClass($class); |
375 | 375 | } catch (ReflectionException $e) { |
376 | - throw new ClassNotFoundException('class not exists: ' . $class, $class, $e); |
|
376 | + throw new ClassNotFoundException('class not exists: '.$class, $class, $e); |
|
377 | 377 | } |
378 | 378 | |
379 | 379 | if ($reflect->hasMethod('__make')) { |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | } elseif ($param->isDefaultValueAvailable()) { |
453 | 453 | $args[] = $param->getDefaultValue(); |
454 | 454 | } else { |
455 | - throw new InvalidArgumentException('method param miss:' . $name); |
|
455 | + throw new InvalidArgumentException('method param miss:'.$name); |
|
456 | 456 | } |
457 | 457 | } |
458 | 458 | |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | */ |
471 | 471 | public static function factory(string $name, string $namespace = '', ...$args) |
472 | 472 | { |
473 | - $class = false !== strpos($name, '\\') ? $name : $namespace . ucwords($name); |
|
473 | + $class = false !== strpos($name, '\\') ? $name : $namespace.ucwords($name); |
|
474 | 474 | |
475 | 475 | return Container::getInstance()->invokeClass($class, $args); |
476 | 476 | } |
@@ -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 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | if ($bind && preg_match('/^[a-z]/is', $bind)) { |
48 | 48 | $bind = str_replace('/', $depr, $bind); |
49 | 49 | // 如果有域名绑定 |
50 | - $url = $bind . ('.' != substr($bind, -1) ? $depr : '') . ltrim($url, $depr); |
|
50 | + $url = $bind.('.' != substr($bind, -1) ? $depr : '').ltrim($url, $depr); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | $path = $this->rule->parseUrlPath($url); |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $controller = !empty($path) ? array_shift($path) : null; |
60 | 60 | |
61 | 61 | if ($controller && !preg_match('/^[A-Za-z0-9][\w|\.]*$/', $controller)) { |
62 | - throw new HttpException(404, 'controller not exists:' . $controller); |
|
62 | + throw new HttpException(404, 'controller not exists:'.$controller); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | // 解析操作 |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | // 解析额外参数 |
70 | 70 | if ($path) { |
71 | - preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) { |
|
71 | + preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) { |
|
72 | 72 | $var[$match[1]] = strip_tags($match[2]); |
73 | 73 | }, implode('|', $path)); |
74 | 74 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $route = [$controller, $action]; |
87 | 87 | |
88 | 88 | if ($this->hasDefinedRoute($route)) { |
89 | - throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url)); |
|
89 | + throw new HttpException(404, 'invalid request:'.str_replace('|', $depr, $url)); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | return $route; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | [$controller, $action] = $route; |
104 | 104 | |
105 | 105 | // 检查地址是否被定义过路由 |
106 | - $name = strtolower(Str::studly($controller) . '/' . $action); |
|
106 | + $name = strtolower(Str::studly($controller).'/'.$action); |
|
107 | 107 | |
108 | 108 | $host = $this->request->host(true); |
109 | 109 | $method = $this->request->method(); |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | // +---------------------------------------------------------------------- |
9 | 9 | // | Author: Slince <[email protected]> |
10 | 10 | // +---------------------------------------------------------------------- |
11 | -declare (strict_types = 1); |
|
11 | +declare(strict_types=1); |
|
12 | 12 | |
13 | 13 | namespace think; |
14 | 14 | |
@@ -133,8 +133,8 @@ discard block |
||
133 | 133 | public function pipeline(string $type = 'global') |
134 | 134 | { |
135 | 135 | return (new Pipeline()) |
136 | - ->through(array_map(function ($middleware) { |
|
137 | - return function ($request, $next) use ($middleware) { |
|
136 | + ->through(array_map(function($middleware) { |
|
137 | + return function($request, $next) use ($middleware) { |
|
138 | 138 | [$call, $param] = $middleware; |
139 | 139 | if (is_array($call) && is_string($call[0])) { |
140 | 140 | $call = [$this->app->make($call[0]), $call[1]]; |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | protected function sortMiddleware(array $middlewares) |
232 | 232 | { |
233 | 233 | $priority = $this->app->config->get('middleware.priority', []); |
234 | - uasort($middlewares, function ($a, $b) use ($priority) { |
|
234 | + uasort($middlewares, function($a, $b) use ($priority) { |
|
235 | 235 | $aPriority = $this->getMiddlewarePriority($priority, $a); |
236 | 236 | $bPriority = $this->getMiddlewarePriority($priority, $b); |
237 | 237 | return $bPriority - $aPriority; |