From 15328afa4d671e293c3b76207d3a039a168b954e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 10 Jul 2011 23:45:38 -0500 Subject: [PATCH] refactoring auto-loader. --- system/loader.php | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/system/loader.php b/system/loader.php index 86960f89..adf3a126 100644 --- a/system/loader.php +++ b/system/loader.php @@ -2,46 +2,31 @@ /** * This function is registered on the auto-loader stack by the front controller. + * + * All namespace slashes will be replaced with directory slashes since all Laravel + * system classes are organized using a namespace to directory convention. */ return function($class) { - // ---------------------------------------------------------- - // Replace namespace slashes with directory slashes. - // ---------------------------------------------------------- $file = strtolower(str_replace('\\', '/', $class)); - // ---------------------------------------------------------- - // Should the class be aliased? - // ---------------------------------------------------------- if (array_key_exists($class, $aliases = System\Config::get('aliases'))) { return class_alias($aliases[$class], $class); } - // ---------------------------------------------------------- - // Is the class a Laravel framework class? - // ---------------------------------------------------------- if (file_exists($path = BASE_PATH.$file.EXT)) { require $path; } - // ---------------------------------------------------------- - // Is the class in the application/models directory? - // ---------------------------------------------------------- elseif (file_exists($path = APP_PATH.'models/'.$file.EXT)) { require $path; } - // ---------------------------------------------------------- - // Is the class in the application/libraries directory? - // ---------------------------------------------------------- elseif (file_exists($path = APP_PATH.'libraries/'.$file.EXT)) { require $path; } - // ---------------------------------------------------------- - // Is the class anywhere in the application directory? - // ---------------------------------------------------------- elseif (file_exists($path = APP_PATH.$file.EXT)) { require $path;