Zend\Di\DefinitionList

* Ensure Zend\Di\DefinitionList checks state of definition before asking for information inside getClassSupertypes()
zendframework · Sep 10, 2012 · d26c6f2 · d26c6f2
1 parent 0a3927d
commit d26c6f2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/library/Zend/Di/DefinitionList.php b/library/Zend/Di/DefinitionList.php
@@ -144,9 +144,13 @@ public function getClassSupertypes($class)
         $supertypes = array();
         /** @var $definition Definition\DefinitionInterface */
         foreach ($this as $definition) {
-            $supertypes = array_merge($supertypes, $definition->getClassSupertypes($class));
+            if ($definition->hasClass($class)) {
+                $supertypes = array_merge($supertypes, $definition->getClassSupertypes($class));
+                if (!$definition instanceof Definition\PartialMarker) {
+                    return $supertypes;
+                }
+            }
         }
-        // @todo remove duplicates?
         return $supertypes;
     }