@@ -37,130 +37,130 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | trait RouteResolver |
| 39 | 39 | { |
| 40 | - /** |
|
| 41 | - * The currently dispatched route instance. |
|
| 42 | - * |
|
| 43 | - * @var \Syscodes\Routing\Route|null |
|
| 44 | - */ |
|
| 45 | - protected $current; |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * Resolve the given route and call the method that belongs to the route. |
|
| 49 | - * |
|
| 50 | - * @param \Syscodes\Http\Request $request |
|
| 51 | - * |
|
| 52 | - * @return \Syscodes\Http\Response |
|
| 53 | - */ |
|
| 54 | - public function resolve(Request $request) |
|
| 55 | - { |
|
| 56 | - return $this->dispatchToRoute($request); |
|
| 57 | - } |
|
| 58 | - |
|
| 59 | - /** |
|
| 60 | - * Dispatch the request to a route and return the response. |
|
| 61 | - * |
|
| 62 | - * @param \Syscodes\Http\Request $request |
|
| 63 | - * |
|
| 64 | - * @return \Syscodes\Http\Response |
|
| 65 | - */ |
|
| 66 | - protected function dispatchToRoute(Request $request) |
|
| 67 | - { |
|
| 68 | - return $this->runRoute($request, $this->findRoute($request)); |
|
| 69 | - } |
|
| 70 | - |
|
| 71 | - /** |
|
| 72 | - * Find the route matching a given request. |
|
| 73 | - * |
|
| 74 | - * @param \Syscodes\Http\Request $request |
|
| 75 | - * |
|
| 76 | - * @return \Syscodes\Routing\Route |
|
| 77 | - */ |
|
| 78 | - protected function findRoute($request) |
|
| 79 | - { |
|
| 80 | - // Get all register routes with the same request method |
|
| 81 | - $this->current = $route = $this->routes->match($request); |
|
| 82 | - |
|
| 83 | - $this->container->instance(Route::class, $route); |
|
| 84 | - |
|
| 85 | - return $route; |
|
| 86 | - } |
|
| 87 | - |
|
| 88 | - /** |
|
| 89 | - * Return the response for the given route. |
|
| 90 | - * |
|
| 91 | - * @param \Syscodes\Http\Request $request |
|
| 92 | - * @param \Syscodes\Routing\Route $route |
|
| 93 | - * |
|
| 94 | - * @return \Syscodes\Http\Response |
|
| 95 | - */ |
|
| 96 | - protected function runRoute(Request $request, Route $route) |
|
| 97 | - { |
|
| 98 | - $request->setRouteResolver(function () use ($route) { |
|
| 99 | - return $route; |
|
| 100 | - }); |
|
| 101 | - |
|
| 102 | - return $this->callResponse($request, |
|
| 103 | - $this->runRouteStack($route, $request) |
|
| 104 | - ); |
|
| 105 | - } |
|
| 106 | - |
|
| 107 | - /** |
|
| 108 | - * Run the given route through a stack response instance. |
|
| 109 | - * |
|
| 110 | - * @param \Syscodes\Routing\Route $route |
|
| 111 | - * @param \Syscodes\Http\Request $request |
|
| 112 | - * |
|
| 113 | - * @return mixed |
|
| 114 | - */ |
|
| 115 | - protected function runRouteStack(Route $route, Request $request) |
|
| 116 | - { |
|
| 117 | - $skipMiddleware = $this->container->bound('middleware.disable') && |
|
| 118 | - ($this->container->make('middleware.disable') === true); |
|
| 40 | + /** |
|
| 41 | + * The currently dispatched route instance. |
|
| 42 | + * |
|
| 43 | + * @var \Syscodes\Routing\Route|null |
|
| 44 | + */ |
|
| 45 | + protected $current; |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * Resolve the given route and call the method that belongs to the route. |
|
| 49 | + * |
|
| 50 | + * @param \Syscodes\Http\Request $request |
|
| 51 | + * |
|
| 52 | + * @return \Syscodes\Http\Response |
|
| 53 | + */ |
|
| 54 | + public function resolve(Request $request) |
|
| 55 | + { |
|
| 56 | + return $this->dispatchToRoute($request); |
|
| 57 | + } |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * Dispatch the request to a route and return the response. |
|
| 61 | + * |
|
| 62 | + * @param \Syscodes\Http\Request $request |
|
| 63 | + * |
|
| 64 | + * @return \Syscodes\Http\Response |
|
| 65 | + */ |
|
| 66 | + protected function dispatchToRoute(Request $request) |
|
| 67 | + { |
|
| 68 | + return $this->runRoute($request, $this->findRoute($request)); |
|
| 69 | + } |
|
| 70 | + |
|
| 71 | + /** |
|
| 72 | + * Find the route matching a given request. |
|
| 73 | + * |
|
| 74 | + * @param \Syscodes\Http\Request $request |
|
| 75 | + * |
|
| 76 | + * @return \Syscodes\Routing\Route |
|
| 77 | + */ |
|
| 78 | + protected function findRoute($request) |
|
| 79 | + { |
|
| 80 | + // Get all register routes with the same request method |
|
| 81 | + $this->current = $route = $this->routes->match($request); |
|
| 82 | + |
|
| 83 | + $this->container->instance(Route::class, $route); |
|
| 84 | + |
|
| 85 | + return $route; |
|
| 86 | + } |
|
| 87 | + |
|
| 88 | + /** |
|
| 89 | + * Return the response for the given route. |
|
| 90 | + * |
|
| 91 | + * @param \Syscodes\Http\Request $request |
|
| 92 | + * @param \Syscodes\Routing\Route $route |
|
| 93 | + * |
|
| 94 | + * @return \Syscodes\Http\Response |
|
| 95 | + */ |
|
| 96 | + protected function runRoute(Request $request, Route $route) |
|
| 97 | + { |
|
| 98 | + $request->setRouteResolver(function () use ($route) { |
|
| 99 | + return $route; |
|
| 100 | + }); |
|
| 101 | + |
|
| 102 | + return $this->callResponse($request, |
|
| 103 | + $this->runRouteStack($route, $request) |
|
| 104 | + ); |
|
| 105 | + } |
|
| 106 | + |
|
| 107 | + /** |
|
| 108 | + * Run the given route through a stack response instance. |
|
| 109 | + * |
|
| 110 | + * @param \Syscodes\Routing\Route $route |
|
| 111 | + * @param \Syscodes\Http\Request $request |
|
| 112 | + * |
|
| 113 | + * @return mixed |
|
| 114 | + */ |
|
| 115 | + protected function runRouteStack(Route $route, Request $request) |
|
| 116 | + { |
|
| 117 | + $skipMiddleware = $this->container->bound('middleware.disable') && |
|
| 118 | + ($this->container->make('middleware.disable') === true); |
|
| 119 | 119 | |
| 120 | 120 | |
| 121 | - $middleware = $skipMiddleware ? [] : $this->gatherRouteMiddleware($route); |
|
| 122 | - |
|
| 123 | - return (new Pipeline($this->container)) |
|
| 124 | - ->send($request) |
|
| 125 | - ->through($middleware) |
|
| 126 | - ->then(function ($request) use ($route) { |
|
| 127 | - return $this->callResponse( |
|
| 128 | - $request, $route->runResolver() |
|
| 129 | - ); |
|
| 130 | - }); |
|
| 131 | - } |
|
| 132 | - |
|
| 133 | - /** |
|
| 134 | - * Create a response instance from the given value. |
|
| 135 | - * |
|
| 136 | - * @param \Syscodes\Http\Request $request |
|
| 137 | - * @param mixed $response |
|
| 138 | - * |
|
| 139 | - * @return \Syscodes\Http\Response |
|
| 140 | - */ |
|
| 141 | - public function callResponse($request, $response) |
|
| 142 | - { |
|
| 143 | - return static::toResponse($request, $response); |
|
| 144 | - } |
|
| 145 | - |
|
| 146 | - /** |
|
| 147 | - * Static version of callResponse. |
|
| 148 | - * |
|
| 149 | - * @param \Syscodes\Http\Request $request |
|
| 150 | - * @param mixed $response |
|
| 151 | - * |
|
| 152 | - * @return \Syscodes\Http\Response |
|
| 153 | - */ |
|
| 154 | - public static function toResponse($request, $response) |
|
| 155 | - { |
|
| 156 | - if ( ! $response instanceof Response && |
|
| 157 | - ($response instanceof Jsonserializable || |
|
| 158 | - is_array($response))) { |
|
| 159 | - $response = new JsonResponse($response); |
|
| 160 | - } elseif ( ! $response instanceof Response) { |
|
| 161 | - $response = new Response($response, 200, ['Content-Type' => 'text/html']); |
|
| 162 | - } |
|
| 163 | - |
|
| 164 | - return $response->prepare($request); |
|
| 165 | - } |
|
| 121 | + $middleware = $skipMiddleware ? [] : $this->gatherRouteMiddleware($route); |
|
| 122 | + |
|
| 123 | + return (new Pipeline($this->container)) |
|
| 124 | + ->send($request) |
|
| 125 | + ->through($middleware) |
|
| 126 | + ->then(function ($request) use ($route) { |
|
| 127 | + return $this->callResponse( |
|
| 128 | + $request, $route->runResolver() |
|
| 129 | + ); |
|
| 130 | + }); |
|
| 131 | + } |
|
| 132 | + |
|
| 133 | + /** |
|
| 134 | + * Create a response instance from the given value. |
|
| 135 | + * |
|
| 136 | + * @param \Syscodes\Http\Request $request |
|
| 137 | + * @param mixed $response |
|
| 138 | + * |
|
| 139 | + * @return \Syscodes\Http\Response |
|
| 140 | + */ |
|
| 141 | + public function callResponse($request, $response) |
|
| 142 | + { |
|
| 143 | + return static::toResponse($request, $response); |
|
| 144 | + } |
|
| 145 | + |
|
| 146 | + /** |
|
| 147 | + * Static version of callResponse. |
|
| 148 | + * |
|
| 149 | + * @param \Syscodes\Http\Request $request |
|
| 150 | + * @param mixed $response |
|
| 151 | + * |
|
| 152 | + * @return \Syscodes\Http\Response |
|
| 153 | + */ |
|
| 154 | + public static function toResponse($request, $response) |
|
| 155 | + { |
|
| 156 | + if ( ! $response instanceof Response && |
|
| 157 | + ($response instanceof Jsonserializable || |
|
| 158 | + is_array($response))) { |
|
| 159 | + $response = new JsonResponse($response); |
|
| 160 | + } elseif ( ! $response instanceof Response) { |
|
| 161 | + $response = new Response($response, 200, ['Content-Type' => 'text/html']); |
|
| 162 | + } |
|
| 163 | + |
|
| 164 | + return $response->prepare($request); |
|
| 165 | + } |
|
| 166 | 166 | } |
| 167 | 167 | \ No newline at end of file |