Zend\Di

- Fixed such that type preferences can be objects
zendframework · Oct 7, 2011 · a9a0285 · a9a0285
1 parent f47a1b7
commit a9a0285
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Di.php b/src/Di.php
@@ -459,6 +459,10 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
             if ($alias && $this->instanceManager->hasTypePreferences($alias)) {
                 $pInstances = $this->instanceManager->getTypePreferences($alias);
                 foreach ($pInstances as $pInstance) {
+                    if (is_object($pInstance)) {
+                        $computedParams['value'][$fqName] = $pInstance;
+                        continue 2;
+                    }
                     $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
                          $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
                     if ($pInstanceClass === $type || $this->isSubclassOf($pInstanceClass, $type)) {
@@ -472,6 +476,10 @@ protected function resolveMethodParameters($class, $method, array $callTimeUserP
             if ($type && $this->instanceManager->hasTypePreferences($type)) {
                 $pInstances = $this->instanceManager->getTypePreferences($type);
                 foreach ($pInstances as $pInstance) {
+                    if (is_object($pInstance)) {
+                        $computedParams['value'][$fqName] = $pInstance;
+                        continue 2;
+                    }
                     $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
                          $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
                     if ($pInstanceClass === $type || $this->isSubclassOf($pInstanceClass, $type)) {