Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing loading of namespaced classes.

This commit is contained in:
Taylor Otwell 2012-03-25 13:23:09 -05:00
parent 991fc70275
commit 3ba6342cf5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
laravel/autoloader.php
View File

@ -66,25 +66,23 @@ class_alias(static::$aliases[$class], $class);
// If the class namespace is mapped to a directory, we will load the // If the class namespace is mapped to a directory, we will load the
// class using the PSR-0 standards from that directory accounting // class using the PSR-0 standards from that directory accounting
// for the root of the namespace by trimming it off. // for the root of the namespace by trimming it off.
$namespace = root_namespace($class).'\\'; foreach (static::$namespaces as $namespace => $directory)
if (isset(static::$namespaces[$namespace]))
{ {
$directory = static::$namespaces[$namespace]; if (starts_with($class, $namespace))
{
return static::load_namespaced($class, $namespace, $directory); return static::load_namespaced($class, $namespace, $directory);
}
} }
// If the class uses PEAR-ish style underscores for indicating its // If the class uses PEAR-ish style underscores for indicating its
// directory structure we'll load the class using PSR-0 standards // directory structure we'll load the class using PSR-0 standards
// standards from that directory, trimming the root. // standards from that directory, trimming the root.
$namespace = root_namespace($class, '_').'_'; foreach (static::$underscored as $prefix => $directory)
if (isset(static::$underscored[$namespace]))
{ {
$directory = static::$underscored[$namespace]; if (starts_with($class, $prefix))
{
return static::load_namespaced($class, $namespace, $directory); return static::load_namespaced($class, $prefix, $directory);
}
} }
// If all else fails we will just iterator through the mapped // If all else fails we will just iterator through the mapped