Skip to content

fix: normalize directory separators in route file paths for Windows #10210

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
jalexiscv wants to merge 1 commit into
base: develop
Choose a base branch
from
+2 −2
Open

fix: normalize directory separators in route file paths for Windows #10210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions system/Router/RouteCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ public function __construct(FileLocatorInterface $locator, Modules $moduleConfig
// Normalize the path string in routeFiles array.
foreach ($this->routeFiles as $routeKey => $routesFile) {
$realpath = realpath($routesFile);
$this->routeFiles[$routeKey] = ($realpath === false) ? $routesFile : $realpath;
$this->routeFiles[$routeKey] = ($realpath === false) ? $routesFile : str_replace('\\', '/', $realpath);
}
}

Expand All @@ -316,7 +316,7 @@ public function loadRoutes(string $routesFile = APPPATH . 'Config/Routes.php')

// Normalize the path string in routesFile
$realpath = realpath($routesFile);
$routesFile = ($realpath === false) ? $routesFile : $realpath;
$routesFile = ($realpath === false) ? $routesFile : str_replace('\\', '/', $realpath);

// Include the passed in routesFile if it doesn't exist.
// Only keeping that around for BC purposes for now.
Expand Down