improved autoloader
This commit is contained in:
parent
6bcd5ad4d8
commit
cade0f5768
@ -31,67 +31,42 @@ namespace miniMVC;
|
||||
*
|
||||
* @param string
|
||||
*/
|
||||
function sys_autoload($name)
|
||||
function _autoload($name)
|
||||
{
|
||||
$name = str_replace('miniMVC\\', '', $name);
|
||||
if ($name == '') return;
|
||||
|
||||
// strip off namespaces - they all go to the same folder
|
||||
$name = strtolower($name);
|
||||
$names = explode('\\', trim($name));
|
||||
$name = end($names);
|
||||
|
||||
$path = MM_SYS_PATH . "/core/{$name}.php";
|
||||
$trait_path = MM_SYS_PATH . "/core/traits/{$name}.php";
|
||||
// Paths to load from
|
||||
$sys_path = MM_SYS_PATH . "core/{$name}.php";
|
||||
$trait_path = MM_SYS_PATH . "core/traits/{$name}.php";
|
||||
$lib_path = MM_SYS_PATH . "libraries/{$name}.php";
|
||||
$class_path = MM_APP_PATH . "classes/{$name}.php";
|
||||
|
||||
if (is_file($path))
|
||||
if (is_file($sys_path))
|
||||
{
|
||||
require_once($path);
|
||||
require_once($sys_path);
|
||||
}
|
||||
elseif (is_file($trait_path))
|
||||
{
|
||||
require_once($trait_path);
|
||||
}
|
||||
}
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Function to autoload libraries/classes
|
||||
*
|
||||
* @param string
|
||||
*/
|
||||
function autoload($name)
|
||||
{
|
||||
// strip off namespaces - they all go to the same folder
|
||||
$names = explode('\\', $name);
|
||||
$name = end($names);
|
||||
|
||||
// In a subdirectory? No problem
|
||||
if (strpos("/", $name) !== FALSE)
|
||||
elseif (is_file($lib_path))
|
||||
{
|
||||
$n = explode("/", $name);
|
||||
$name = $n[count($n) -1];
|
||||
require_once($lib_path);
|
||||
}
|
||||
|
||||
// Try system library first, then app library
|
||||
$name = strtolower($name);
|
||||
$path = MM_SYS_PATH . "libraries/{$name}.php";
|
||||
|
||||
if ( ! is_file($path))
|
||||
if (is_file($class_path))
|
||||
{
|
||||
$path = MM_APP_PATH . "classes/{$name}.php";
|
||||
}
|
||||
|
||||
// Load the class file if need be
|
||||
if ( ! class_exists($name))
|
||||
{
|
||||
if (is_file($path))
|
||||
{
|
||||
require_once($path);
|
||||
}
|
||||
require_once($class_path);
|
||||
}
|
||||
}
|
||||
|
||||
// Load system libraries/traits
|
||||
spl_autoload_register('miniMVC\sys_autoload');
|
||||
|
||||
// Start the library autoloader
|
||||
spl_autoload_register('miniMVC\autoload');
|
||||
// Start the autoloader
|
||||
spl_autoload_register('miniMVC\_autoload');
|
||||
|
||||
// --------------------------------------------------------------------------
|
||||
// ! Error handling / messages
|
||||
@ -465,13 +440,9 @@ function route()
|
||||
$class = new $controller();
|
||||
return call_user_func_array([&$class, $func], []);
|
||||
}
|
||||
|
||||
// Function doesn't exist...404
|
||||
show_404();
|
||||
die();
|
||||
}
|
||||
|
||||
// If it gets here, it's still a 404
|
||||
// Function doesn't exist...404
|
||||
show_404();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user