surya/apimacro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commaaa2

Browse Source
This commit is contained in:
Paolo A
2024-08-13 13:44:16 +00:00
parent 1bbb23088d
commit e796d76612
4001 changed files with 30101 additions and 40075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vendor/laravel/framework/src/Illuminate/Routing/CompiledRouteCollection.php vendored
View File

@@ -152,7 +152,7 @@ class CompiledRouteCollection extends AbstractRouteCollection
*/
protected function requestWithoutTrailingSlash(Request $request)
{
$trimmedRequest = Request::createFromBase($request);
$trimmedRequest = $request->duplicate();
$parts = explode('?', $request->server->get('REQUEST_URI'), 2);
@@ -252,7 +252,7 @@ class CompiledRouteCollection extends AbstractRouteCollection
})
->map(function (Collection $routes) {
return $routes->mapWithKeys(function (Route $route) {
return [$route->uri => $route];
return [$route->getDomain().$route->uri => $route];
})->all();
})
->all();
@@ -293,12 +293,13 @@ class CompiledRouteCollection extends AbstractRouteCollection
), '/');
}
return $this->router->newRoute($attributes['methods'], $baseUri == '' ? '/' : $baseUri, $attributes['action'])
return $this->router->newRoute($attributes['methods'], $baseUri === '' ? '/' : $baseUri, $attributes['action'])
->setFallback($attributes['fallback'])
->setDefaults($attributes['defaults'])
->setWheres($attributes['wheres'])
->setBindingFields($attributes['bindingFields'])
->block($attributes['lockSeconds'] ?? null, $attributes['waitSeconds'] ?? null);
->block($attributes['lockSeconds'] ?? null, $attributes['waitSeconds'] ?? null)
->withTrashed($attributes['withTrashed'] ?? false);
}
/**