tweaks to package handling.

This commit is contained in:
Taylor Otwell
2011-08-02 22:40:12 -05:00
parent dbf43877c6
commit 188b0c4f29
4 changed files with 12 additions and 18 deletions

View File

@@ -65,7 +65,7 @@ class Loader {
*/
public static function register($path)
{
static::$paths[] = $path;
static::$paths[] = rtrim($path, '/').'/';
}
}

View File

@@ -12,30 +12,23 @@ class Package {
/**
* Load a package or set of packages.
*
* @param string|array $package
* @param string|array $packages
* @return void
*/
public static function load($package)
public static function load($packages)
{
if (is_array($package))
foreach ((array) $packages as $package)
{
foreach ($package as $value)
// Packages may have a bootstrap file, which commonly is used to register auto-loaders
// and perform other initialization needed to use the package. If the package has a
// bootstrapper, we will require it here.
if ( ! array_key_exists($package, static::$loaded) and file_exists($path = PACKAGE_PATH.$package.'/bootstrap'.EXT))
{
static::load($value);
require $path;
}
return;
static::$loaded[] = $package;
}
// Packages may have a bootstrap file, which commonly is used to register auto-loaders
// and perform other initialization needed to use the package. If the package has a
// bootstrapper, we will require it here.
if ( ! array_key_exists($package, static::$loaded) and file_exists($path = PACKAGE_PATH.$package.'/bootstrap'.EXT))
{
require $path;
}
static::$loaded[] = $package;
}
}