Skip to content

Commit ac6f3a8

Browse files
committed
extract method
1 parent 3d58cd9 commit ac6f3a8

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

src/Illuminate/Routing/CompiledRouteCollection.php

+20-7
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,10 @@ public function refreshActionLookups()
109109
*/
110110
public function match(Request $request)
111111
{
112-
$trimmedRequest = clone $request;
113-
114-
$trimmedRequest->server->set(
115-
'REQUEST_URI', rtrim($request->server->get('REQUEST_URI'), '/')
116-
);
117-
118112
$matcher = new CompiledUrlMatcher(
119-
$this->compiled, (new RequestContext)->fromRequest($trimmedRequest)
113+
$this->compiled, (new RequestContext)->fromRequest(
114+
$trimmedRequest = $this->requestWithoutTrailingSlash($request)
115+
)
120116
);
121117

122118
$route = null;
@@ -148,6 +144,23 @@ public function match(Request $request)
148144
return $this->handleMatchedRoute($request, $route);
149145
}
150146

147+
/**
148+
* Get a cloned instance of the given request without any trailing slash on the URI.
149+
*
150+
* @param \Illuminate\Http\Request $request
151+
* @return \Illuminate\Http\Request
152+
*/
153+
protected function requestWithoutTrailingSlash(Request $request)
154+
{
155+
$trimmedRequest = clone $request;
156+
157+
$trimmedRequest->server->set(
158+
'REQUEST_URI', rtrim($request->server->get('REQUEST_URI'), '/')
159+
);
160+
161+
return $trimmedRequest;
162+
}
163+
151164
/**
152165
* Get routes from the collection by method.
153166
*

0 commit comments

Comments
 (0)