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

automatically prepare the directories registered with the auto-loader.

This commit is contained in:
Taylor Otwell 2012-01-18 10:08:07 -06:00
parent 490fd46c69
commit 775020666a
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
laravel/autoloader.php
View File

@ -160,11 +160,7 @@ public static function alias($class, $alias)
*/ */
public static function psr($directory) public static function psr($directory)
{ {
$directories = array_map(function($directory) $directories = static::format($directory);
{
return rtrim($directory, '/').'/';
}, (array) $directory);
static::$psr = array_unique(array_merge(static::$psr, $directories)); static::$psr = array_unique(array_merge(static::$psr, $directories));
} }
@ -177,7 +173,26 @@ public static function psr($directory)
*/ */
public static function namespaces($mappings) public static function namespaces($mappings)
{ {
$directories = static::format(array_values($mappings));
$mappings = array_combine(array_keys($mappings), $directories);
static::$namespaces = array_merge(static::$namespaces, $mappings); static::$namespaces = array_merge(static::$namespaces, $mappings);
} }
/**
* Format an array of directories with the proper trailing slashes.
*
* @param array $directories
* @return array
*/
protected static function format($directories)
{
return array_map(function($directory)
{
return rtrim($directory, DS).DS;
}, (array) $directories);
}
} }