@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * |
| 91 | 91 | * @return void |
| 92 | 92 | */ |
| 93 | - public function __construct( Container $app, Router $router ) { |
|
| 93 | + public function __construct(Container $app, Router $router) { |
|
| 94 | 94 | $this->app = $app; |
| 95 | 95 | $this->router = $router; |
| 96 | 96 | |
@@ -106,16 +106,16 @@ discard block |
||
| 106 | 106 | * |
| 107 | 107 | * @return \Illuminate\Http\Response |
| 108 | 108 | */ |
| 109 | - public function handle( $request ) { |
|
| 109 | + public function handle($request) { |
|
| 110 | 110 | try { |
| 111 | 111 | $request->enableHttpMethodParameterOverride(); |
| 112 | - $response = $this->send_request_through_router( $request ); |
|
| 113 | - } catch ( Throwable $e ) { |
|
| 114 | - throw new \Exception( $e, 1 ); |
|
| 112 | + $response = $this->send_request_through_router($request); |
|
| 113 | + } catch (Throwable $e) { |
|
| 114 | + throw new \Exception($e, 1); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | $this->app['events']->dispatch( |
| 118 | - new RequestHandled( $request, $response ) |
|
| 118 | + new RequestHandled($request, $response) |
|
| 119 | 119 | ); |
| 120 | 120 | |
| 121 | 121 | return $response; |
@@ -128,17 +128,17 @@ discard block |
||
| 128 | 128 | * |
| 129 | 129 | * @return \Illuminate\Http\Response |
| 130 | 130 | */ |
| 131 | - protected function send_request_through_router( $request ) { |
|
| 132 | - $this->app->instance( 'request', $request ); |
|
| 131 | + protected function send_request_through_router($request) { |
|
| 132 | + $this->app->instance('request', $request); |
|
| 133 | 133 | |
| 134 | - Facade::clearResolvedInstance( 'request' ); |
|
| 134 | + Facade::clearResolvedInstance('request'); |
|
| 135 | 135 | |
| 136 | 136 | $this->bootstrap(); |
| 137 | 137 | |
| 138 | - return ( new Pipeline( $this->app ) ) |
|
| 139 | - ->send( $request ) |
|
| 140 | - ->through( $this->middleware ) |
|
| 141 | - ->then( $this->dispatch_to_router() ); |
|
| 138 | + return (new Pipeline($this->app)) |
|
| 139 | + ->send($request) |
|
| 140 | + ->through($this->middleware) |
|
| 141 | + ->then($this->dispatch_to_router()); |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | /** |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | * @return \Closure |
| 155 | 155 | */ |
| 156 | 156 | protected function dispatch_to_router() { |
| 157 | - return function ( $request ) { |
|
| 158 | - $this->app->instance( 'request', $request ); |
|
| 157 | + return function($request) { |
|
| 158 | + $this->app->instance('request', $request); |
|
| 159 | 159 | |
| 160 | - return $this->router->dispatch( $request ); |
|
| 160 | + return $this->router->dispatch($request); |
|
| 161 | 161 | }; |
| 162 | 162 | } |
| 163 | 163 | |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | * |
| 170 | 170 | * @return void |
| 171 | 171 | */ |
| 172 | - public function terminate( $request, $response ) { |
|
| 173 | - $this->terminate_middleware( $request, $response ); |
|
| 172 | + public function terminate($request, $response) { |
|
| 173 | + $this->terminate_middleware($request, $response); |
|
| 174 | 174 | |
| 175 | 175 | $this->app->terminate(); |
| 176 | 176 | } |
@@ -183,23 +183,23 @@ discard block |
||
| 183 | 183 | * |
| 184 | 184 | * @return void |
| 185 | 185 | */ |
| 186 | - protected function terminate_middleware( $request, $response ) { |
|
| 186 | + protected function terminate_middleware($request, $response) { |
|
| 187 | 187 | $middlewares = $this->app->shouldSkipMiddleware() ? array() : array_merge( |
| 188 | - $this->gather_route_middleware( $request ), |
|
| 188 | + $this->gather_route_middleware($request), |
|
| 189 | 189 | $this->middleware |
| 190 | 190 | ); |
| 191 | 191 | |
| 192 | - foreach ( $middlewares as $middleware ) { |
|
| 193 | - if ( ! is_string( $middleware ) ) { |
|
| 192 | + foreach ($middlewares as $middleware) { |
|
| 193 | + if (!is_string($middleware)) { |
|
| 194 | 194 | continue; |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - list( $name ) = $this->parse_middleware( $middleware ); |
|
| 197 | + list($name) = $this->parse_middleware($middleware); |
|
| 198 | 198 | |
| 199 | - $instance = $this->app->make( $name ); |
|
| 199 | + $instance = $this->app->make($name); |
|
| 200 | 200 | |
| 201 | - if ( method_exists( $instance, 'terminate' ) ) { |
|
| 202 | - $instance->terminate( $request, $response ); |
|
| 201 | + if (method_exists($instance, 'terminate')) { |
|
| 202 | + $instance->terminate($request, $response); |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | } |
@@ -211,10 +211,10 @@ discard block |
||
| 211 | 211 | * |
| 212 | 212 | * @return array |
| 213 | 213 | */ |
| 214 | - protected function gather_route_middleware( $request ) { |
|
| 214 | + protected function gather_route_middleware($request) { |
|
| 215 | 215 | $route = $request->route(); |
| 216 | - if ( $route ) { |
|
| 217 | - return $this->router->gatherRouteMiddleware( $route ); |
|
| 216 | + if ($route) { |
|
| 217 | + return $this->router->gatherRouteMiddleware($route); |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | return array(); |
@@ -227,15 +227,15 @@ discard block |
||
| 227 | 227 | * |
| 228 | 228 | * @return array |
| 229 | 229 | */ |
| 230 | - protected function parse_middleware( $middleware ) { |
|
| 230 | + protected function parse_middleware($middleware) { |
|
| 231 | 231 | |
| 232 | - list( $name, $parameters ) = array_pad( explode( ':', $middleware, 2 ), 2, array() ); |
|
| 232 | + list($name, $parameters) = array_pad(explode(':', $middleware, 2), 2, array()); |
|
| 233 | 233 | |
| 234 | - if ( is_string( $parameters ) ) { |
|
| 235 | - $parameters = explode( ',', $parameters ); |
|
| 234 | + if (is_string($parameters)) { |
|
| 235 | + $parameters = explode(',', $parameters); |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - return array( $name, $parameters ); |
|
| 238 | + return array($name, $parameters); |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | /** |
@@ -245,8 +245,8 @@ discard block |
||
| 245 | 245 | * |
| 246 | 246 | * @return bool |
| 247 | 247 | */ |
| 248 | - public function has_middleware( $middleware ) { |
|
| 249 | - return in_array( $middleware, $this->middleware ); |
|
| 248 | + public function has_middleware($middleware) { |
|
| 249 | + return in_array($middleware, $this->middleware); |
|
| 250 | 250 | } |
| 251 | 251 | |
| 252 | 252 | /** |
@@ -256,9 +256,9 @@ discard block |
||
| 256 | 256 | * |
| 257 | 257 | * @return $this |
| 258 | 258 | */ |
| 259 | - public function prepend_middleware( $middleware ) { |
|
| 260 | - if ( array_search( $middleware, $this->middleware ) === false ) { |
|
| 261 | - array_unshift( $this->middleware, $middleware ); |
|
| 259 | + public function prepend_middleware($middleware) { |
|
| 260 | + if (array_search($middleware, $this->middleware) === false) { |
|
| 261 | + array_unshift($this->middleware, $middleware); |
|
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | return $this; |
@@ -271,8 +271,8 @@ discard block |
||
| 271 | 271 | * |
| 272 | 272 | * @return $this |
| 273 | 273 | */ |
| 274 | - public function push_middleware( $middleware ) { |
|
| 275 | - if ( array_search( $middleware, $this->middleware ) === false ) { |
|
| 274 | + public function push_middleware($middleware) { |
|
| 275 | + if (array_search($middleware, $this->middleware) === false) { |
|
| 276 | 276 | $this->middleware[] = $middleware; |
| 277 | 277 | } |
| 278 | 278 | |
@@ -289,13 +289,13 @@ discard block |
||
| 289 | 289 | * |
| 290 | 290 | * @return $this |
| 291 | 291 | */ |
| 292 | - public function prepend_middleware_to_group( $group, $middleware ) { |
|
| 293 | - if ( ! isset( $this->middleware_groups[ $group ] ) ) { |
|
| 294 | - throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." ); |
|
| 292 | + public function prepend_middleware_to_group($group, $middleware) { |
|
| 293 | + if (!isset($this->middleware_groups[$group])) { |
|
| 294 | + throw new InvalidArgumentException("The [{$group}] middleware group has not been defined."); |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | - if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) { |
|
| 298 | - array_unshift( $this->middleware_groups[ $group ], $middleware ); |
|
| 297 | + if (array_search($middleware, $this->middleware_groups[$group]) === false) { |
|
| 298 | + array_unshift($this->middleware_groups[$group], $middleware); |
|
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | $this->sync_middleware_to_router(); |
@@ -313,13 +313,13 @@ discard block |
||
| 313 | 313 | * |
| 314 | 314 | * @return $this |
| 315 | 315 | */ |
| 316 | - public function append_middleware_to_group( $group, $middleware ) { |
|
| 317 | - if ( ! isset( $this->middleware_groups[ $group ] ) ) { |
|
| 318 | - throw new InvalidArgumentException( "The [{$group}] middleware group has not been defined." ); |
|
| 316 | + public function append_middleware_to_group($group, $middleware) { |
|
| 317 | + if (!isset($this->middleware_groups[$group])) { |
|
| 318 | + throw new InvalidArgumentException("The [{$group}] middleware group has not been defined."); |
|
| 319 | 319 | } |
| 320 | 320 | |
| 321 | - if ( array_search( $middleware, $this->middleware_groups[ $group ] ) === false ) { |
|
| 322 | - $this->middleware_groups[ $group ][] = $middleware; |
|
| 321 | + if (array_search($middleware, $this->middleware_groups[$group]) === false) { |
|
| 322 | + $this->middleware_groups[$group][] = $middleware; |
|
| 323 | 323 | } |
| 324 | 324 | |
| 325 | 325 | $this->sync_middleware_to_router(); |
@@ -334,9 +334,9 @@ discard block |
||
| 334 | 334 | * |
| 335 | 335 | * @return $this |
| 336 | 336 | */ |
| 337 | - public function prepend_to_middleware_priority( $middleware ) { |
|
| 338 | - if ( ! in_array( $middleware, $this->middleware_priority ) ) { |
|
| 339 | - array_unshift( $this->middleware_priority, $middleware ); |
|
| 337 | + public function prepend_to_middleware_priority($middleware) { |
|
| 338 | + if (!in_array($middleware, $this->middleware_priority)) { |
|
| 339 | + array_unshift($this->middleware_priority, $middleware); |
|
| 340 | 340 | } |
| 341 | 341 | |
| 342 | 342 | $this->sync_middleware_to_router(); |
@@ -351,8 +351,8 @@ discard block |
||
| 351 | 351 | * |
| 352 | 352 | * @return $this |
| 353 | 353 | */ |
| 354 | - public function append_to_middleware_priority( $middleware ) { |
|
| 355 | - if ( ! in_array( $middleware, $this->middleware_priority ) ) { |
|
| 354 | + public function append_to_middleware_priority($middleware) { |
|
| 355 | + if (!in_array($middleware, $this->middleware_priority)) { |
|
| 356 | 356 | $this->middleware_priority[] = $middleware; |
| 357 | 357 | } |
| 358 | 358 | |
@@ -369,12 +369,12 @@ discard block |
||
| 369 | 369 | protected function sync_middleware_to_router() { |
| 370 | 370 | $this->router->middlewarePriority = $this->middleware_priority; |
| 371 | 371 | |
| 372 | - foreach ( $this->middleware_groups as $key => $middleware ) { |
|
| 373 | - $this->router->middlewareGroup( $key, $middleware ); |
|
| 372 | + foreach ($this->middleware_groups as $key => $middleware) { |
|
| 373 | + $this->router->middlewareGroup($key, $middleware); |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | - foreach ( $this->route_middleware as $key => $middleware ) { |
|
| 377 | - $this->router->aliasMiddleware( $key, $middleware ); |
|
| 376 | + foreach ($this->route_middleware as $key => $middleware) { |
|
| 377 | + $this->router->aliasMiddleware($key, $middleware); |
|
| 378 | 378 | } |
| 379 | 379 | } |
| 380 | 380 | |
@@ -394,8 +394,8 @@ discard block |
||
| 394 | 394 | * |
| 395 | 395 | * @return void |
| 396 | 396 | */ |
| 397 | - protected function report_exception( Throwable $e ) { |
|
| 398 | - $this->app[ ExceptionHandler::class ]->report( $e ); |
|
| 397 | + protected function report_exception(Throwable $e) { |
|
| 398 | + $this->app[ExceptionHandler::class]->report($e); |
|
| 399 | 399 | } |
| 400 | 400 | |
| 401 | 401 | /** |
@@ -406,8 +406,8 @@ discard block |
||
| 406 | 406 | * |
| 407 | 407 | * @return \Symfony\Component\HttpFoundation\Response |
| 408 | 408 | */ |
| 409 | - protected function render_exception( $request, Throwable $e ) { |
|
| 410 | - return $this->app[ ExceptionHandler::class ]->render( $request, $e ); |
|
| 409 | + protected function render_exception($request, Throwable $e) { |
|
| 410 | + return $this->app[ExceptionHandler::class]->render($request, $e); |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | /** |