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

refactoring autoloader.

This commit is contained in:
Taylor Otwell 2011-11-09 22:57:06 -06:00
parent fe218f9b0b
commit 3854165595
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
laravel/autoloader.php
View File

@ -54,7 +54,7 @@ protected static function find($class)
{ {
// After PHP namespaces were introduced, most libaries ditched underscores for // After PHP namespaces were introduced, most libaries ditched underscores for
// for namespaces to indicate the class directory hierarchy. We will check for // for namespaces to indicate the class directory hierarchy. We will check for
// the present of namespace slashes to determine the directory separator. // the presence of namespace slashes to determine the directory separator.
$separator = (strpos($class, '\\') !== false) ? '\\' : '_'; $separator = (strpos($class, '\\') !== false) ? '\\' : '_';
$library = substr($class, 0, strpos($class, $separator)); $library = substr($class, 0, strpos($class, $separator));
@ -66,25 +66,7 @@ protected static function find($class)
// namespaces and underscores indicate the directory hierarchy of the class. // namespaces and underscores indicate the directory hierarchy of the class.
if (isset(static::$libraries[$library])) if (isset(static::$libraries[$library]))
{ {
return str_replace('_', '/', $file).EXT; return LIBRARY_PATH.str_replace('_', '/', $file).EXT;
}
foreach (static::$paths as $path)
{
if (file_exists($path = $path.strtolower($file).EXT))
{
return $path;
}
}
// If we could not find the class file in any of the auto-loaded locations
// according to the Laravel naming standard, we will search the libraries
// directory for the class according to the PSR-0 naming standard.
if (file_exists($path = LIBRARY_PATH.str_replace('_', '/', $file).EXT))
{
static::$libraries[] = $library;
return $path;
} }
// Since not all controllers will be resolved by the controller resolver, // Since not all controllers will be resolved by the controller resolver,
@ -100,6 +82,29 @@ protected static function find($class)
return $path; return $path;
} }
} }
// Next we will search through the common Laravel paths for the class file.
// The Laravel framework path, along with the libraries and models paths
// will be searched according to the Laravel class naming standard.
$lower = strtolower($file);
foreach (static::$paths as $path)
{
if (file_exists($path = $path.$lower.EXT))
{
return $path;
}
}
// If we could not find the class file in any of the auto-loaded locations
// according to the Laravel naming standard, we will search the libraries
// directory for the class according to the PSR-0 naming standard.
if (file_exists($path = LIBRARY_PATH.str_replace('_', '/', $file).EXT))
{
static::$libraries[] = $library;
return $path;
}
} }
} }