From 2280546c051996d0dcd227075e9d36e7fd6370e8 Mon Sep 17 00:00:00 2001 From: "Buster \"Silver Eagle\" Neece" Date: Mon, 7 Sep 2020 05:18:13 -0500 Subject: [PATCH] Fix how Router detects class names. --- src/Router/Router.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Router/Router.php b/src/Router/Router.php index bb324c0..38f75e5 100644 --- a/src/Router/Router.php +++ b/src/Router/Router.php @@ -42,8 +42,7 @@ class Router $phpFiles = new \RegexIterator($iteratorIterator, '/^.+\.php$/i', \RecursiveRegexIterator::GET_MATCH); foreach ($phpFiles as $controllerFile) { - /** @var \SplFileInfo $controllerFile */ - $fileClassName = str_replace('.php', '', $controllerFile->getFilename()); + $fileClassName = ltrim(str_replace([$controllerPath, '/', '.php'], ['', '\\', ''], $controllerFile[0]), '\\'); $expectedClasses = [ $baseNamespace . '\\Controllers\\' . $fileClassName, 'Benzine\\Controllers\\' . $fileClassName, @@ -85,6 +84,8 @@ class Router $this->addRoute($newRoute); } } + + break; } } }