Skip to content

fix(Router): handle {locale} placeholder in redirect routes #10761

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

Open
banghamid wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(Router): handle {locale} placeholder in redirect routes #10761

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
2ee1ddc
fix(Router): handle {locale} placeholder in redirect routes
banghamid Nov 11, 2026
33ff382
test(Router): cover redirect status code and locale edge cases
banghamid Nov 11, 2026
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
33 changes: 19 additions & 14 deletions system/Router/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,20 +457,6 @@ protected function checkRoutes(string $uri): bool

// Does the RegEx match?
if (preg_match('#^' . $routeKey . '$#u', $uri, $matches)) {
// Is this route supposed to redirect to another?
if ($this->collection->isRedirect($routeKey)) {
// replacing matched route groups with references: post/([0-9]+) -> post/$1
$redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
static $i = 1;

return '$' . $i++;
}, is_array($handler) ? key($handler) : $handler);

throw new RedirectException(
preg_replace('#\A' . $routeKey . '\z#u', $redirectTo, $uri),
$this->collection->getRedirectCode($routeKey),
);
}
// Store our locale so CodeIgniter object can
// assign it to the Request.
if (str_contains($matchedKey, '{locale}')) {
Expand All @@ -491,6 +477,25 @@ protected function checkRoutes(string $uri): bool
unset($matched);
}

// Is this route supposed to redirect to another?
if ($this->collection->isRedirect($matchedKey)) {
// replacing matched route groups with references: post/([0-9]+) -> post/$1
$redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function (): string {
static $i = 1;

return '$' . $i++;
}, is_array($handler) ? key($handler) : $handler);

if (str_contains($matchedKey, '{locale}')) {
$redirectTo = str_replace('{locale}', $this->detectedLocale, $redirectTo);
}

throw new RedirectException(
preg_replace('#\A' . $routeKey . '\z#u', $redirectTo, $uri),
$this->collection->getRedirectCode($matchedKey),
);
}

// Are we using Closures? If so, then we need
// to collect the params into an array
// so it can be passed to the controller method later.
Expand Down
24 changes: 24 additions & 0 deletions tests/system/Router/RouterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,7 @@ public function testRedirectRoute(

$this->expectException(RedirectException::class);
$this->expectExceptionMessage($expectedPath);
$this->expectExceptionCode(302);

$router = new Router($collection, $this->request);
$router->handle($url);
Expand All @@ -976,9 +977,32 @@ public static function provideRedirectRoute(): iterable
['post/(:num)', 'article/(:num)', 'alias', '/article/1', 'post/1', 'alias'],
['post/(:num)/comment/(:any)', 'article/(:num)/(:any)', 'post/$1/comment/$2', '/article/1/2', 'post/1/comment/2', 'alias'],
['post/(:segment)/comment/(:any)', 'article/(:num)/(:any)', 'alias', '/article/1/2', 'post/1/comment/2', 'alias'],
['posts', '{locale}/articles', 'posts', '/en/articles', 'posts', 'alias'],
['{locale}/posts', '{locale}/articles', '{locale}/posts', '/en/articles', 'en/posts', 'alias'],
['{locale}/posts', '{locale}/articles', 'alias', '/en/articles', 'en/posts', 'alias'],
['{locale}/post/(:num)', '{locale}/article/(:num)', '{locale}/post/$1', '/en/article/1', 'en/post/1', 'alias'],
['{locale}/post/(:num)', '{locale}/article/(:num)', 'alias', '/en/article/1', 'en/post/1', 'alias'],
];
}

public function testRedirectRouteWithUnsupportedLocale(): void
{
$config = config(App::class);
$config->supportedLocales = ['en'];

$collection = clone $this->collection;
$collection->resetRoutes();
$collection->useSupportedLocalesOnly(true);

$collection->get('{locale}/posts', 'Controller::method');
$collection->addRedirect('{locale}/articles', '{locale}/posts');

$this->expectException(PageNotFoundException::class);

$router = new Router($collection, $this->request);
$router->handle('/fr/articles');
}

public function testRoutePlaceholderAnyWithMultipleSegmentsParamFalse(): void
{
$this->createRouteCollection();
Expand Down
Loading