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

Commit b81deab

Browse files
committed
Merge branch 'hotfix/2872'
Close zendframework/zendframework#2872
28 parents 27c9604 + 5fe6f9b + ff3afa0 + b658b6a + 8a67cfa + c13245d + 4c0c206 + d20df42 + 84cabf6 + 4daeba0 + 660eb19 + 587b0dd + 13e8cbe + 7100033 + 50b1c92 + 94eb741 + 1ca385c + 86e6515 + 58c378d + 061dbfa + 897f6bf + e3cc86e + 6524484 + 8243aea + 627112b + 710ddb9 + 65adbd2 + 262dc5e commit b81deab

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/AutoloaderFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static function factory($options = null)
8484
);
8585
}
8686

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

104104
if ($class === static::STANDARD_AUTOLOADER) {
105-
$autoloader->setOptions($options);
105+
$autoloader->setOptions($autoloaderOptions);
106106
} else {
107-
$autoloader = new $class($options);
107+
$autoloader = new $class($autoloaderOptions);
108108
}
109109
$autoloader->register();
110110
static::$loaders[$class] = $autoloader;
111111
} else {
112-
static::$loaders[$class]->setOptions($options);
112+
static::$loaders[$class]->setOptions($autoloaderOptions);
113113
}
114114
}
115115
}

0 commit comments

Comments
 (0)