[9.x] Use request isMethod instead of method comparison (#39526)

seriquynh · web-flow · commit 032c69a1ef2c · 2021-11-08T09:13:08.000-06:00
* Use request isMethod instead of method comparison

* Fix testGuestPutPreviousUrlInSession
diff --git 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
@@ -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
@@ -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()) {
diff --git 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');
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ protected function matchAgainstRoutes(array $routes, $request, $includingMethod`
`94`	`94`	`*/`
`95`	`95`	`protected function getRouteForMethods($request, array $methods)`
`96`	`96`	`{`
`97`		`- if ($request->method() === 'OPTIONS') {`
	`97`	`+ if ($request->isMethod('OPTIONS')) {`
`98`	`98`	`return (new Route('OPTIONS', $request->path(), function () use ($methods) {`
`99`	`99`	`return new Response('', 200, ['Allow' => implode(',', $methods)]);`
`100`	`100`	`}))->bind($request);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function guest($path, $status = 302, $headers = [], $secure = null)`
`84`	`84`	`{`
`85`	`85`	`$request = $this->generator->getRequest();`
`86`	`86`
`87`		`- $intended = $request->method() === 'GET' && $request->route() && ! $request->expectsJson()`
	`87`	`+ $intended = $request->isMethod('GET') && $request->route() && ! $request->expectsJson()`
`88`	`88`	`? $this->generator->full()`
`89`	`89`	`: $this->generator->previous();`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ protected function configHitsLottery(array $config)`
`199`	`199`	`*/`
`200`	`200`	`protected function storeCurrentUrl(Request $request, $session)`
`201`	`201`	`{`
`202`		`- if ($request->method() === 'GET' &&`
	`202`	`+ if ($request->isMethod('GET') &&`
`203`	`203`	`$request->route() instanceof Route &&`
`204`	`204`	`! $request->ajax() &&`
`205`	`205`	`! $request->prefetch()) {`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function testGuestPutCurrentUrlInSession()`
`83`	`83`
`84`	`84`	`public function testGuestPutPreviousUrlInSession()`
`85`	`85`	`{`
`86`		`- $this->request->shouldReceive('method')->once()->andReturn('POST');`
	`86`	`+ $this->request->shouldReceive('isMethod')->once()->with('GET')->andReturn(false);`
`87`	`87`	`$this->session->shouldReceive('put')->once()->with('url.intended', 'http://foo.com/bar');`
`88`	`88`	`$this->url->shouldReceive('previous')->once()->andReturn('http://foo.com/bar');`
`89`	`89`