#83 - fix for issue #83 - avoiding infinite loops by skipping alias r…

…esolution for already visited aliases
zendframework · Jan 26, 2016 · 149ed56 · 149ed56
1 parent 7c27f4a
commit 149ed56
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -569,10 +569,15 @@ private function resolveInitializers(array $initializers)
     private function resolveAliases(array $aliases)
     {
         foreach ($aliases as $alias => $service) {
-            $name = $alias;
+            // avoiding infinite loops by removing already resolved aliases
+            $currentAliases = $this->aliases;
+            $name           = $alias;
 
-            while (isset($this->aliases[$name])) {
-                $name = $this->aliases[$name];
+            while (isset($currentAliases[$name])) {
+                $oldName = $name;
+                $name    = $currentAliases[$name];
+
+                unset($currentAliases[$oldName]);
             }
 
             $this->resolvedAliases[$alias] = $name;