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

reduce repetitive getDefaultNamespace() and controllerName() function call in Router #3298

Merged
merged 2 commits into from
Jul 13, 2020
Merged

reduce repetitive getDefaultNamespace() and controllerName() function call in Router #3298

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01ba49f
reduce repetitive getDefaultNamespace() and controllerName() function…
samsonasik Jul 13, 2020
56c780b
rename defaultNameSpace to defaultNamespace
samsonasik Jul 13, 2020
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
Next Next commit
reduce repetitive getDefaultNamespace() and controllerName() function… 
… call in Router
  • Loading branch information
@samsonasik
samsonasik committed Jul 13, 2020
commit 01ba49ff60f4f8b9a8f5e7e303ca9f46b92204f6
12 changes: 7 additions & 5 deletions system/Router/Router.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,11 +548,13 @@ public function autoRoute(string $uri)
$this->params = $segments;
}

$defaultNameSpace = $this->collection->getDefaultNamespace();
$controllerName = $this->controllerName();
if ($this->collection->getHTTPVerb() !== 'cli')
{
$controller = '\\' . $this->collection->getDefaultNamespace();
$controller = '\\' . $defaultNameSpace;
$controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
$controller .= $this->controllerName();
$controller .= $controllerName;
$controller = strtolower($controller);
$methodName = strtolower($this->methodName());

Expand All @@ -575,17 +577,17 @@ public function autoRoute(string $uri)
}

// Load the file so that it's available for CodeIgniter.
$file = APPPATH . 'Controllers/' . $this->directory . $this->controllerName() . '.php';
$file = APPPATH . 'Controllers/' . $this->directory . $controllerName . '.php';
if (is_file($file))
{
include_once $file;
}

// Ensure the controller stores the fully-qualified class name
// We have to check for a length over 1, since by default it will be '\'
if (strpos($this->controller, '\\') === false && strlen($this->collection->getDefaultNamespace()) > 1)
if (strpos($this->controller, '\\') === false && strlen($defaultNameSpace) > 1)
{
$this->controller = '\\' . ltrim(str_replace('/', '\\', $this->collection->getDefaultNamespace() . $this->directory . $this->controllerName()), '\\');
$this->controller = '\\' . ltrim(str_replace('/', '\\', $defaultNameSpace . $this->directory . $controllerName), '\\');
}
}

Expand Down