Skip to content
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

listNamespaceFiles: Ensure trailing slash #2149

Merged
merged 2 commits into from
Aug 19, 2019
Merged

listNamespaceFiles: Ensure trailing slash #2149

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
a81084f
Ensure trailing slash on $namespacePath
MGatner Aug 19, 2019
d6b26b8
Clarify Composer comment
MGatner Aug 19, 2019
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
2 changes: 1 addition & 1 deletion system/Autoloader/Autoloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ protected function discoverComposerNamespaces()
unset($paths['CodeIgniter\\']);
}

// Composer stores paths with trailng slash. We don't.
// Composer stores namespaces with trailing slash. We don't.
$newPaths = [];
foreach ($paths as $key => $value)
{
Expand Down
2 changes: 1 addition & 1 deletion system/Autoloader/FileLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ public function listNamespaceFiles(string $prefix, string $path): array
// autoloader->getNamespace($prefix) returns an array of paths for that namespace
foreach ($this->autoloader->getNamespace($prefix) as $namespacePath)
{
$fullPath = realpath($namespacePath . $path);
$fullPath = realpath(rtrim($namespacePath, '/') . '/' . $path);

if (! is_dir($fullPath))
{
Expand Down