Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2872'
Browse files Browse the repository at this point in the history
  • Loading branch information
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/AutoloaderFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public static function factory($options = null)
);
}

foreach ($options as $class => $options) {
foreach ($options as $class => $autoloaderOptions) {
if (!isset(static::$loaders[$class])) {
$autoloader = static::getStandardAutoloader();
if (!class_exists($class) && !$autoloader->autoload($class)) {
Expand All @@ -102,14 +102,14 @@ public static function factory($options = null)
}

if ($class === static::STANDARD_AUTOLOADER) {
$autoloader->setOptions($options);
$autoloader->setOptions($autoloaderOptions);
} else {
$autoloader = new $class($options);
$autoloader = new $class($autoloaderOptions);
}
$autoloader->register();
static::$loaders[$class] = $autoloader;
} else {
static::$loaders[$class]->setOptions($options);
static::$loaders[$class]->setOptions($autoloaderOptions);
}
}
}
Expand Down

0 comments on commit b81deab

Please sign in to comment.