优化 Http 未找到路由处理

imiphp · Nov 8, 2019 · a144ccc · a144ccc
1 parent c4a522f
commit a144ccc
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/src/Server/Http/Middleware/RouteMiddleware.php b/src/Server/Http/Middleware/RouteMiddleware.php
@@ -28,6 +28,13 @@ class RouteMiddleware implements MiddlewareInterface
      */
     protected $route;
 
+    /**
+     * @ServerInject("HttpNotFoundHandler")
+     *
+     * @var \Imi\Server\Http\Error\IHttpNotFoundHandler
+     */
+    protected $notFoundHandler;
+
     /**
      * 处理方法
      * @param ServerRequestInterface $request
@@ -36,21 +43,21 @@ class RouteMiddleware implements MiddlewareInterface
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        // 路由解析
-        $result = $this->route->parse($request);
-        if(null === $result || !is_callable($result->callable))
-        {
-            // 未匹配到路由
-            $response = App::getBean('HttpNotFoundHandler')->handle($handler, $request, RequestContext::get('response'));
-            return $response;
-        }
-        else
-        {
-            RequestContext::set('routeResult', $result);
-        }
-        $response = $handler->handle($request);
-        RequestContext::set('response', $response);
-        return $response;
+        return RequestContext::use(function(&$context) use($request, $handler){
+            // 路由解析
+            $result = $this->route->parse($request);
+            if(null === $result || !is_callable($result->callable))
+            {
+                // 未匹配到路由
+                $response = $this->notFoundHandler->handle($handler, $request, $context['response']);
+            }
+            else
+            {
+                $context['routeResult'] = $result;
+                $response = $handler->handle($request);
+            }
+            return $context['response'] = $response;
+        });
     }
 
 }