top-think / framework

src/think/Middleware.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: Slince <taosikai@yeah.net>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -128,8 +128,8 @@ 
     public function pipeline(string $type = 'global')
     {
         return (new Pipeline())
-            ->through(array_map(function ($middleware) {
-                return function ($request, $next) use ($middleware) {
+            ->through(array_map(function($middleware) {
+                return function($request, $next) use ($middleware) {
                     list($call, $param) = $middleware;
                     if (is_array($call) && is_string($call[0])) {
                         $call = [$this->app->make($call[0]), $call[1]];
@@ -226,7 +226,7 @@ 
     protected function sortMiddleware(array $middlewares)
     {
         $priority = $this->app->config->get('middleware.priority', []);
-        uasort($middlewares, function ($a, $b) use ($priority) {
+        uasort($middlewares, function($a, $b) use ($priority) {
             $aPriority = $this->getMiddlewarePriority($priority, $a);
             $bPriority = $this->getMiddlewarePriority($priority, $b);
             return $bPriority - $aPriority;

src/think/route/dispatch/Url.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route\dispatch;
 
@@ -47,7 +47,7 @@ 
         if ($bind && preg_match('/^[a-z]/is', $bind)) {
             $bind = str_replace('/', $depr, $bind);
             // 如果有域名绑定
-            $url = $bind . ('.' != substr($bind, -1) ? $depr : '') . ltrim($url, $depr);
+            $url = $bind.('.' != substr($bind, -1) ? $depr : '').ltrim($url, $depr);
         }
 
         $path = $this->rule->parseUrlPath($url);
@@ -59,7 +59,7 @@ 
         $controller = !empty($path) ? array_shift($path) : null;
 
         if ($controller && !preg_match('/^[A-Za-z][\w|\.]*$/', $controller)) {
-            throw new HttpException(404, 'controller not exists:' . $controller);
+            throw new HttpException(404, 'controller not exists:'.$controller);
         }
 
         // 解析操作
@@ -68,7 +68,7 @@ 
 
         // 解析额外参数
         if ($path) {
-            preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+            preg_replace_callback('/(\w+)\|([^\|]+)/', function($match) use (&$var) {
                 $var[$match[1]] = strip_tags($match[2]);
             }, implode('|', $path));
         }
@@ -86,7 +86,7 @@ 
         $route = [$controller, $action];
 
         if ($this->hasDefinedRoute($route)) {
-            throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url));
+            throw new HttpException(404, 'invalid request:'.str_replace('|', $depr, $url));
         }
 
         return $route;
@@ -103,7 +103,7 @@ 
         list($controller, $action) = $route;
 
         // 检查地址是否被定义过路由
-        $name = strtolower(Str::studly($controller) . '/' . $action);
+        $name = strtolower(Str::studly($controller).'/'.$action);
 
         $host   = $this->request->host(true);
         $method = $this->request->method();

src/think/Route.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -170,9 +170,9 @@ 
         $this->ruleName = new RuleName();
         $this->setDefaultDomain();
 
-        if (is_file($this->app->getRuntimePath() . 'route.php')) {
+        if (is_file($this->app->getRuntimePath().'route.php')) {
             // 读取路由映射文件
-            $this->import(include $this->app->getRuntimePath() . 'route.php');
+            $this->import(include $this->app->getRuntimePath().'route.php');
         }
     }
 
@@ -402,13 +402,13 @@ 
         if (is_null($domain)) {
             $domain = $this->host;
         } elseif (false === strpos($domain, '.')) {
-            $domain .= '.' . $this->request->rootDomain();
+            $domain .= '.'.$this->request->rootDomain();
         }
 
         $subDomain = $this->request->subDomain();
 
         if (strpos($subDomain, '.')) {
-            $name = '*' . strstr($subDomain, '.');
+            $name = '*'.strstr($subDomain, '.');
         }
 
         if (isset($this->bind[$domain])) {
@@ -740,7 +740,7 @@ 
         $this->init();
 
         if ($withRoute) {
-            $checkCallback = function () use ($withRoute) {
+            $checkCallback = function() use ($withRoute) {
                 //加载路由
                 $withRoute();
                 return $this->check();
@@ -761,7 +761,7 @@ 
 
         return $this->app->middleware->pipeline('route')
             ->send($request)
-            ->then(function () use ($dispatch) {
+            ->then(function() use ($dispatch) {
                 return $dispatch->run();
             });
     }
@@ -778,7 +778,7 @@ 
             $closure  = $this->config['route_check_cache_key'];
             $routeKey = $closure($request);
         } else {
-            $routeKey = md5($request->baseUrl(true) . ':' . $request->method());
+            $routeKey = md5($request->baseUrl(true).':'.$request->method());
         }
 
         return $routeKey;
@@ -828,10 +828,10 @@ 
             $path = $pathinfo;
         } elseif ($suffix) {
             // 去除正常的URL后缀
-            $path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+            $path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
         } else {
             // 允许任何后缀访问
-            $path = preg_replace('/\.' . $this->request->ext() . '$/i', '', $pathinfo);
+            $path = preg_replace('/\.'.$this->request->ext().'$/i', '', $pathinfo);
         }
 
         return $path;
@@ -874,9 +874,9 @@ 
                 $item = $this->domains[$this->host];
             } elseif (isset($this->domains[$subDomain])) {
                 $item = $this->domains[$subDomain];
-            } elseif (isset($this->domains['*.' . $domain2]) && !empty($domain3)) {
+            } elseif (isset($this->domains['*.'.$domain2]) && !empty($domain3)) {
                 // 泛三级域名
-                $item      = $this->domains['*.' . $domain2];
+                $item      = $this->domains['*.'.$domain2];
                 $panDomain = $domain3;
             } elseif (isset($this->domains['*']) && !empty($domain2)) {
                 // 泛二级域名

tests/HttpTest.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 
         $route = m::mock(Route::class);
 
-        $route->shouldReceive('dispatch')->withArgs(function ($req, $withRoute) use ($request) {
+        $route->shouldReceive('dispatch')->withArgs(function($req, $withRoute) use ($request) {
             if ($withRoute) {
                 $withRoute();
             }
@@ -77,8 +77,8 @@ 
             ],
         ]);
 
-        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url() . DIRECTORY_SEPARATOR);
-        $this->app->shouldReceive('getRootPath')->andReturn($root->url() . DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url().DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getRootPath')->andReturn($root->url().DIRECTORY_SEPARATOR);
 
         $request  = m::mock(Request::class)->makePartial();
         $response = m::mock(Response::class)->makePartial();

src/think/Http.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -52,7 +52,7 @@ 
     {
         $this->app = $app;
 
-        $this->routePath = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+        $this->routePath = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -199,14 +199,14 @@ 
 
         return $this->app->middleware->pipeline()
             ->send($request)
-            ->then(function ($request) {
+            ->then(function($request) {
                 return $this->dispatchToRoute($request);
             });
     }
 
     protected function dispatchToRoute($request)
     {
-        $withRoute = $this->app->config->get('app.with_route', true) ? function () {
+        $withRoute = $this->app->config->get('app.with_route', true) ? function() {
             $this->loadRoutes();
         } : null;
 
@@ -218,8 +218,8 @@ 
      */
     protected function loadMiddleware(): void
     {
-        if (is_file($this->app->getBasePath() . 'middleware.php')) {
-            $this->app->middleware->import(include $this->app->getBasePath() . 'middleware.php');
+        if (is_file($this->app->getBasePath().'middleware.php')) {
+            $this->app->middleware->import(include $this->app->getBasePath().'middleware.php');
         }
     }
 
@@ -234,7 +234,7 @@ 
         $routePath = $this->getRoutePath();
 
         if (is_dir($routePath)) {
-            $files = glob($routePath . '*.php');
+            $files = glob($routePath.'*.php');
             foreach ($files as $file) {
                 include $file;
             }

src/think/route/Url.php

Spacing +18 added lines, -18 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -190,7 +190,7 @@ 
                 }
             }
         } elseif (false === strpos($domain, '.') && 0 !== strpos($domain, $rootDomain)) {
-            $domain .= '.' . $rootDomain;
+            $domain .= '.'.$rootDomain;
         }
 
         if (false !== strpos($domain, '://')) {
@@ -199,7 +199,7 @@ 
             $scheme = $this->https || $request->isSsl() ? 'https://' : 'http://';
         }
 
-        return $scheme . $domain;
+        return $scheme.$domain;
     }
 
     /**
@@ -218,7 +218,7 @@ 
             }
         }
 
-        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.' . $suffix;
+        return (empty($suffix) || 0 === strpos($suffix, '.')) ? (string) $suffix : '.'.$suffix;
     }
 
     /**
@@ -287,7 +287,7 @@ 
     {
         $request = $this->app->request;
         if (is_string($allowDomain) && false === strpos($allowDomain, '.')) {
-            $allowDomain .= '.' . $request->rootDomain();
+            $allowDomain .= '.'.$request->rootDomain();
         }
 
         foreach ($rule as $item) {
@@ -305,7 +305,7 @@ 
             }
 
             if (!in_array($request->port(), [80, 443])) {
-                $domain .= ':' . $request->port();
+                $domain .= ':'.$request->port();
             }
 
             if (empty($pattern)) {
@@ -316,12 +316,12 @@ 
 
             foreach ($pattern as $key => $val) {
                 if (isset($vars[$key])) {
-                    $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key, '<' . $key . '>'], $type ? $vars[$key] : urlencode((string) $vars[$key]), $url);
+                    $url = str_replace(['[:'.$key.']', '<'.$key.'?>', ':'.$key, '<'.$key.'>'], $type ? $vars[$key] : urlencode((string) $vars[$key]), $url);
                     unset($vars[$key]);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } elseif (2 == $val) {
-                    $url    = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
+                    $url    = str_replace(['/[:'.$key.']', '[:'.$key.']', '<'.$key.'?>'], '', $url);
                     $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
                     $result = [rtrim($url, '?/-'), $domain, $suffix];
                 } else {
@@ -349,7 +349,7 @@ 
         if (0 === strpos($url, '[') && $pos = strpos($url, ']')) {
             // [name] 表示使用路由命名标识生成URL
             $name = substr($url, 1, $pos - 1);
-            $url  = 'name' . substr($url, $pos + 1);
+            $url  = 'name'.substr($url, $pos + 1);
         }
 
         if (false === strpos($url, '://') && 0 !== strpos($url, '/')) {
@@ -376,7 +376,7 @@ 
         }
 
         if ($url) {
-            $checkName   = isset($name) ? $name : $url . (isset($info['query']) ? '?' . $info['query'] : '');
+            $checkName   = isset($name) ? $name : $url.(isset($info['query']) ? '?'.$info['query'] : '');
             $checkDomain = $domain && is_string($domain) ? $domain : null;
 
             $rule = $this->route->getName($checkName, $checkDomain);
@@ -402,7 +402,7 @@ 
                 $suffix = $match[2];
             }
         } elseif (!empty($rule) && isset($name)) {
-            throw new \InvalidArgumentException('route name not exists:' . $name);
+            throw new \InvalidArgumentException('route name not exists:'.$name);
         } else {
             // 检测URL绑定
             $bind = $this->route->getDomainBind($domain && is_string($domain) ? $domain : null);
@@ -440,7 +440,7 @@ 
             $file = str_replace('\\', '/', dirname($file));
         }
 
-        $url = rtrim($file, '/') . '/' . $url;
+        $url = rtrim($file, '/').'/'.$url;
 
         // URL后缀
         if ('/' == substr($url, -1) || '' == $url) {
@@ -450,32 +450,32 @@ 
         }
 
         // 锚点
-        $anchor = !empty($anchor) ? '#' . $anchor : '';
+        $anchor = !empty($anchor) ? '#'.$anchor : '';
 
         // 参数组装
         if (!empty($vars)) {
             // 添加参数
             if ($this->route->config('url_common_param')) {
                 $vars = http_build_query($vars);
-                $url .= $suffix . '?' . $vars . $anchor;
+                $url .= $suffix.'?'.$vars.$anchor;
             } else {
                 foreach ($vars as $var => $val) {
                     if ('' !== $val) {
-                        $url .= $depr . $var . $depr . urlencode((string) $val);
+                        $url .= $depr.$var.$depr.urlencode((string) $val);
                     }
                 }
 
-                $url .= $suffix . $anchor;
+                $url .= $suffix.$anchor;
             }
         } else {
-            $url .= $suffix . $anchor;
+            $url .= $suffix.$anchor;
         }
 
         // 检测域名
         $domain = $this->parseDomain($url, $domain);
 
         // URL组装
-        return $domain . rtrim($this->root, '/') . '/' . ltrim($url, '/');
+        return $domain.rtrim($this->root, '/').'/'.ltrim($url, '/');
     }
 
     public function __toString()

src/think/console/Command.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\console;
 
@@ -404,7 +404,7 @@ 
         ];
         $replacements = [
             $name,
-            $_SERVER['PHP_SELF'] . ' ' . $name,
+            $_SERVER['PHP_SELF'].' '.$name,
         ];
 
         return str_replace($placeholders, $replacements, $this->getHelp());

src/think/console/command/optimize/Route.php

Spacing +6 added lines, -6 removed lines

@@ -29,9 +29,9 @@ 
     {
         $dir = $input->getOption('dir');
 
-        $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '');
 
-        $filename = $path . 'route.php';
+        $filename = $path.'route.php';
         if (is_file($filename)) {
             unlink($filename);
         }
@@ -46,21 +46,21 @@ 
         $this->app->route->lazy(false);
 
         // 路由检测
-        $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '');
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
         //触发路由载入完成事件
         $this->app->event->trigger(RouteLoaded::class);
 
-        $content = '<?php ' . PHP_EOL . 'return ';
-        $content .= '\Opis\Closure\unserialize(\'' . \Opis\Closure\serialize($this->app->route->getName()) . '\');';
+        $content = '<?php '.PHP_EOL.'return ';
+        $content .= '\Opis\Closure\unserialize(\''.\Opis\Closure\serialize($this->app->route->getName()).'\');';
         return $content;
     }
 

src/think/console/command/RouteList.php

Spacing +7 added lines, -7 removed lines

@@ -43,9 +43,9 @@ 
         $dir = $input->getOption('dir');
 
         if ($dir) {
-            $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . 'route_list.php';
+            $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.'route_list.php';
         } else {
-            $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'route_list.php';
+            $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'route_list.php';
         }
 
         if (is_file($filename)) {
@@ -55,7 +55,7 @@ 
         }
 
         $content = $this->getRouteList($dir);
-        file_put_contents($filename, 'Route List' . PHP_EOL . $content);
+        file_put_contents($filename, 'Route List'.PHP_EOL.$content);
     }
 
     protected function getRouteList(string $dir = null): string
@@ -64,16 +64,16 @@ 
         $this->app->route->clear();
 
         if ($dir) {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
         } else {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
         }
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
@@ -112,7 +112,7 @@ 
                 $sort = $this->sortBy[$sort];
             }
 
-            uasort($rows, function ($a, $b) use ($sort) {
+            uasort($rows, function($a, $b) use ($sort) {
                 $itemA = $a[$sort] ?? null;
                 $itemB = $b[$sort] ?? null;