improved: genug\autoloader()

genug · Feb 21, 2018 · 510222a · 510222a
1 parent 3584a37
commit 510222a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/genug_core/genug/bootstrap.php b/genug_core/genug/bootstrap.php
@@ -88,11 +88,15 @@
 
     function autoloader($class)
     {
-        if (\strpos($class, __NAMESPACE__) !== 0) {
+        if (\strpos($class, __NAMESPACE__ . '\\') !== 0) {
             return;
         }
-
-        $fileName = namespace\CORE_DIR . \DIRECTORY_SEPARATOR . \strtolower($class) . '.php';
+
+        $fileName = (function () use ($class) {
+            $relativePath = \str_replace('\\', \DIRECTORY_SEPARATOR, \strtolower($class));
+            return namespace\CORE_DIR . \DIRECTORY_SEPARATOR . $relativePath . '.php';
+        })();
+
         $isProperFileName = (function () use ($fileName) {
             $fileInfo = new \SplFileInfo($fileName);
             return ($fileInfo->isFile() && $fileInfo->isReadable());