Skip to content

Commit b4b896a

Browse files
committed
Move URL resolving into Closure
1 parent 2933f99 commit b4b896a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Response.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -374,15 +374,15 @@ public function isPartial(Request $request): bool
374374
*/
375375
protected function getUrl(Request $request): string
376376
{
377-
if ($this->urlResolver) {
378-
return App::call($this->urlResolver, ['request' => $request]);
379-
}
377+
$urlResolver = $this->urlResolver ?? function (Request $request) {
378+
$url = Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/');
380379

381-
$url = Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/');
380+
$rawUri = Str::before($request->getRequestUri(), '?');
382381

383-
$rawUri = Str::before($request->getRequestUri(), '?');
382+
return Str::endsWith($rawUri, '/') ? $this->finishUrlWithTrailingSlash($url) : $url;
383+
};
384384

385-
return Str::endsWith($rawUri, '/') ? $this->finishUrlWithTrailingSlash($url) : $url;
385+
return App::call($urlResolver, ['request' => $request]);
386386
}
387387

388388
/**

0 commit comments

Comments
 (0)