Skip to content

Fix: Breaking changes #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Meldiron merged 2 commits into from
Mar 6, 2025
Merged

Fix: Breaking changes #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
719b5dc
Reapply "Avoid breaking change"
Meldiron Mar 6, 2025
916424c
quality fix
Meldiron Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Route.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function getHook(): bool
* @param int $index
* @return void
*/
public function setPathParam(string $path, string $key, int $index): void
public function setPathParam(string $key, int $index, string $path = ''): void
{
$this->pathParams[$path][$key] = $index;
}
Expand All @@ -165,12 +165,18 @@ public function setPathParam(string $path, string $key, int $index): void
* @param \Utopia\Request $request
* @return array
*/
public function getPathValues(Request $request, string $path): array
public function getPathValues(Request $request, string $path = ''): array
{
$pathValues = [];
$parts = explode('/', ltrim($request->getURI(), '/'));

foreach (($this->pathParams[$path] ?? []) as $key => $index) {
if (empty($path)) {
$pathParams = $this->pathParams[$path] ?? \array_values($this->pathParams)[0] ?? [];
} else {
$pathParams = $this->pathParams[$path] ?? [];
}

foreach ($pathParams as $key => $index) {
if (array_key_exists($index, $parts)) {
$pathValues[$key] = $parts[$index];
}
Expand Down
4 changes: 2 additions & 2 deletions src/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static function addRoute(Route $route): void
}

foreach ($params as $key => $index) {
$route->setPathParam($path, $key, $index);
$route->setPathParam($key, $index, $path);
}

self::$routes[$route->getMethod()][$path] = $route;
Expand All @@ -108,7 +108,7 @@ public static function addRouteAlias(string $path, Route $route): void
}

foreach ($params as $key => $index) {
$route->setPathParam($alias, $key, $index);
$route->setPathParam($key, $index, $alias);
}

self::$routes[$route->getMethod()][$alias] = $route;
Expand Down