Using withMethod to update request object based on _method

cakephp · Oct 10, 2016 · a16aa45 · a16aa45
1 parent 8793b83
commit a16aa45
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Routing/Middleware/RoutingMiddleware.php b/src/Routing/Middleware/RoutingMiddleware.php
@@ -39,10 +39,17 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             Router::setRequestContext($request);
             $params = (array)$request->getAttribute('params', []);
             if (empty($params['controller'])) {
-                $path = $request->getUri()->getPath();
                 $parsedBody = $request->getParsedBody();
-                $method = is_array($parsedBody) && isset($parsedBody['_method']) ? $parsedBody['_method'] : $request->getMethod();
-                $request = $request->withAttribute('params', Router::parse($path, $method));
+                if (is_array($parsedBody) && isset($parsedBody['_method'])) {
+                    $request = $request->withMethod($parsedBody['_method']);
+                }
+                $request = $request->withAttribute(
+                    'params',
+                    Router::parse(
+                        $request->getUri()->getPath(),
+                        $request->getMethod()
+                    )
+                );
             }
         } catch (RedirectException $e) {
             return new RedirectResponse(