|
@@ -66,25 +66,23 @@ class Autoloader {
|
|
|
|
|
|
|
|
|
|
|
|
- $namespace = root_namespace($class).'\\';
|
|
|
-
|
|
|
- if (isset(static::$namespaces[$namespace]))
|
|
|
+ foreach (static::$namespaces as $namespace => $directory)
|
|
|
{
|
|
|
- $directory = static::$namespaces[$namespace];
|
|
|
-
|
|
|
- return static::load_namespaced($class, $namespace, $directory);
|
|
|
+ if (starts_with($class, $namespace))
|
|
|
+ {
|
|
|
+ return static::load_namespaced($class, $namespace, $directory);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- $namespace = root_namespace($class, '_').'_';
|
|
|
-
|
|
|
- if (isset(static::$underscored[$namespace]))
|
|
|
+ foreach (static::$underscored as $prefix => $directory)
|
|
|
{
|
|
|
- $directory = static::$underscored[$namespace];
|
|
|
-
|
|
|
- return static::load_namespaced($class, $namespace, $directory);
|
|
|
+ if (starts_with($class, $prefix))
|
|
|
+ {
|
|
|
+ return static::load_namespaced($class, $prefix, $directory);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|