Merge branch 'hotfix/zendframework/zendframework#5959-zendframework/z…

…endframework#6022-zendframework/zendframework#6051-di-abstract-factory-without-instantiators-fallback' Close zendframework/zendframework#5959 zendframework/zendframework#6022 zendframework/zendframework#6051
zendframework · Apr 3, 2014 · 698e4c9 · 698e4c9
2 parents 25d94d4 + d56de0e
commit 698e4c9
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Di/DiAbstractServiceFactory.php b/src/Di/DiAbstractServiceFactory.php
@@ -51,10 +51,18 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        return $this->instanceManager->hasSharedInstance($requestedName)
+        if ($this->instanceManager->hasSharedInstance($requestedName)
             || $this->instanceManager->hasAlias($requestedName)
             || $this->instanceManager->hasConfig($requestedName)
             || $this->instanceManager->hasTypePreferences($requestedName)
-            || $this->definitions->hasClass($requestedName);
+        ) {
+            return true;
+        }
+
+        if (! $this->definitions->hasClass($requestedName) || interface_exists($requestedName)) {
+            return false;
+        }
+
+        return true;
     }
 }