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.php

Spacing +15 added lines, -15 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -177,9 +177,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');
         }
     }
 
@@ -420,13 +420,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])) {
@@ -760,7 +760,7 @@ 
         $this->init();
 
         if ($withRoute) {
-            $checkCallback = function () use ($withRoute) {
+            $checkCallback = function() use ($withRoute) {
                 //加载路由
                 $withRoute();
                 return $this->check();
@@ -781,10 +781,10 @@ 
 
         return $this->app->middleware->pipeline()
             ->send($request)
-            ->then(function ($request) use ($dispatch) {
+            ->then(function($request) use ($dispatch) {
                 return $this->app->middleware->pipeline('route')
                     ->send($request)
-                    ->then(function () use ($dispatch) {
+                    ->then(function() use ($dispatch) {
                         return $dispatch->run();
                     });
             });
@@ -802,7 +802,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;
@@ -852,10 +852,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;
@@ -884,7 +884,7 @@ 
                     $appName = $map[$name];
                 }
             } elseif ($name && (false !== array_search($name, $map) || in_array($name, $deny))) {
-                throw new HttpException(404, 'app not exists:' . $name);
+                throw new HttpException(404, 'app not exists:'.$name);
             } elseif ($name && isset($map['*'])) {
                 $appName = $map['*'];
             } else {
@@ -892,7 +892,7 @@ 
             }
 
             if ($name) {
-                $this->request->setRoot('/' . $name);
+                $this->request->setRoot('/'.$name);
                 $url = strpos($url, '|') ? ltrim(strstr($url, '|'), '|') : '';
                 $this->request->setPathinfo(str_replace('|', $this->config['pathinfo_depr'], $url));
             }
@@ -929,9 +929,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)) {
                 // 泛二级域名