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

more autoloader tweaks.

This commit is contained in:
Taylor Otwell 2012-02-06 13:20:08 -06:00
parent 94b4887000
commit 56ae5e9a7b
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
laravel/autoloader.php
View File

@ -180,22 +180,6 @@ public static function psr($directory)
static::$psr = array_unique(array_merge(static::$psr, $directories)); static::$psr = array_unique(array_merge(static::$psr, $directories));
} }
/**
* Map namespaces to directories.
*
* @param array $mappings
* @return void
*/
public static function namespaces($mappings)
{
foreach ($mappings as $namespace => $directory)
{
$namespace = trim($namespace, '\\').'\\';
static::$namespaces[$namespace] = head(static::format($directory));
}
}
/** /**
* Register underscored "namespaces" to directory mappings. * Register underscored "namespaces" to directory mappings.
* *
@ -203,11 +187,36 @@ public static function namespaces($mappings)
* @return void * @return void
*/ */
public static function underscored($mappings) public static function underscored($mappings)
{
static::namespaces($mappings, '_');
}
/**
* Map namespaces to directories.
*
* @param array $mappings
* @param string $append
* @return void
*/
public static function namespaces($mappings, $append = '\\')
{ {
foreach ($mappings as $namespace => $directory) foreach ($mappings as $namespace => $directory)
{ {
static::$namespaces[$namespace.'_'] = head(static::format($directory)); // When adding new namespaces to the mappings, we will unset the previously
// mapped value if it existed. This allows previously registered spaces to
// be mapped to new directories on the fly.
$namespace = trim($namespace, $append).$append;
unset(static::$namespaces[$namespace]);
$namespaces[$namespace] = head(static::format($directory));
} }
// We'll array_merge the new mappings onto the front of the array so
// derivative namespaces are not always shadowed by their parents.
// For instance, when mappings Laravel\Docs, we don't want the
// main Laravel namespace to always override it.
static::$namespaces = array_merge($namespaces, static::$namespaces);
} }
/** /**