From 2718c5b5e85f876d4933168dba0a8139f0cf3fe2 Mon Sep 17 00:00:00 2001 From: Quynh Xuan Nguyen Date: Mon, 8 Nov 2021 10:10:27 +0700 Subject: [PATCH 1/2] Use request isMethod instead of method comparison --- src/Illuminate/Routing/AbstractRouteCollection.php | 2 +- src/Illuminate/Routing/Redirector.php | 2 +- src/Illuminate/Session/Middleware/StartSession.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Routing/AbstractRouteCollection.php b/src/Illuminate/Routing/AbstractRouteCollection.php index 9599d0e45fda..a8d601a09704 100644 --- a/src/Illuminate/Routing/AbstractRouteCollection.php +++ b/src/Illuminate/Routing/AbstractRouteCollection.php @@ -94,7 +94,7 @@ protected function matchAgainstRoutes(array $routes, $request, $includingMethod */ protected function getRouteForMethods($request, array $methods) { - if ($request->method() === 'OPTIONS') { + if ($request->isMethod('OPTIONS')) { return (new Route('OPTIONS', $request->path(), function () use ($methods) { return new Response('', 200, ['Allow' => implode(',', $methods)]); }))->bind($request); diff --git a/src/Illuminate/Routing/Redirector.php b/src/Illuminate/Routing/Redirector.php index 3a5b50392165..05f50745a2c5 100755 --- a/src/Illuminate/Routing/Redirector.php +++ b/src/Illuminate/Routing/Redirector.php @@ -84,7 +84,7 @@ public function guest($path, $status = 302, $headers = [], $secure = null) { $request = $this->generator->getRequest(); - $intended = $request->method() === 'GET' && $request->route() && ! $request->expectsJson() + $intended = $request->isMethod('GET') && $request->route() && ! $request->expectsJson() ? $this->generator->full() : $this->generator->previous(); diff --git a/src/Illuminate/Session/Middleware/StartSession.php b/src/Illuminate/Session/Middleware/StartSession.php index e7d2daa22315..9c51a442e3bf 100644 --- a/src/Illuminate/Session/Middleware/StartSession.php +++ b/src/Illuminate/Session/Middleware/StartSession.php @@ -199,7 +199,7 @@ protected function configHitsLottery(array $config) */ protected function storeCurrentUrl(Request $request, $session) { - if ($request->method() === 'GET' && + if ($request->isMethod('GET') && $request->route() instanceof Route && ! $request->ajax() && ! $request->prefetch()) { From b4c8fe2857a50345c19171c1d7831980c3f6fb23 Mon Sep 17 00:00:00 2001 From: Quynh Xuan Nguyen Date: Mon, 8 Nov 2021 17:27:58 +0700 Subject: [PATCH 2/2] Fix testGuestPutPreviousUrlInSession --- tests/Routing/RoutingRedirectorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Routing/RoutingRedirectorTest.php b/tests/Routing/RoutingRedirectorTest.php index d8177dca303b..4e822aa59947 100644 --- a/tests/Routing/RoutingRedirectorTest.php +++ b/tests/Routing/RoutingRedirectorTest.php @@ -83,7 +83,7 @@ public function testGuestPutCurrentUrlInSession() public function testGuestPutPreviousUrlInSession() { - $this->request->shouldReceive('method')->once()->andReturn('POST'); + $this->request->shouldReceive('isMethod')->once()->with('GET')->andReturn(false); $this->session->shouldReceive('put')->once()->with('url.intended', 'http://foo.com/bar'); $this->url->shouldReceive('previous')->once()->andReturn('http://foo.com/bar');