Merge remote-tracking branch 'upstream/8.x' into 8.x

TBlindaruk · TBlindaruk · commit 57c24bf71ee2 · 2022-05-18T17:56:44.000+02:00
diff --git a/src/Illuminate/Routing/CompiledRouteCollection.php b/src/Illuminate/Routing/CompiledRouteCollection.php
@@ -152,7 +152,7 @@ public function match(Request $request)
      */
     protected function requestWithoutTrailingSlash(Request $request)
     {
-        $trimmedRequest = Request::createFromBase($request);
+        $trimmedRequest = $request->duplicate();
 
         $parts = explode('?', $request->server->get('REQUEST_URI'), 2);
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function match(Request $request)`
`152`	`152`	`*/`
`153`	`153`	`protected function requestWithoutTrailingSlash(Request $request)`
`154`	`154`	`{`
`155`		`- $trimmedRequest = Request::createFromBase($request);`
	`155`	`+ $trimmedRequest = $request->duplicate();`
`156`	`156`
`157`	`157`	`$parts = explode('?', $request->server->get('REQUEST_URI'), 2);`
`158`	`158`