Fixed Zend\Di\DependnecyInjector matching of preferred classes with i…

…s_subclass_of due to a bug in PHP: https://bugs.php.net/bug.php?id=53727
taat · Jun 29, 2011 · c2863d5 · c2863d5
1 parent 800bb09
commit c2863d5
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 5 deletions.
diff --git a/library/Zend/Di/DependencyInjector.php b/library/Zend/Di/DependencyInjector.php
@@ -288,6 +288,20 @@ protected function handleInjectionMethodForObject($object, $method, $params, $al
      */
     protected function resolveMethodParameters($class, $method, array $userParams, $isInstantiator, $alias)
     {
+        static $isSubclassFunc = null;
+        static $isSubclassFuncCache = null;
+
+        $isSubclassFunc = function($class, $type) use (&$isSubclassFuncCache) {
+            /* @see https://bugs.php.net/bug.php?id=53727 */
+            if ($isSubclassFuncCache === null) {
+                $isSubclassFuncCache = array();
+            }
+            if (!array_key_exists($class, $isSubclassFuncCache)) {
+                $isSubclassFuncCache[$class] = class_parents($class, true) + class_implements($class, true);
+            }
+            return (isset($isSubclassFuncCache[$class][$type]));
+        };
+
         $resolvedParams = array();
 
         $injectionMethodParameters = $this->definition->getInjectionMethodParameters($class, $method);
@@ -296,7 +310,6 @@ protected function resolveMethodParameters($class, $method, array $userParams, $
         $computedLookupParams = array();
 
         foreach ($injectionMethodParameters as $name => $type) {
-            //$computedValueParams[$name] = null;
 
             // first consult user provided parameters
             if (isset($userParams[$name])) {
@@ -326,9 +339,9 @@ protected function resolveMethodParameters($class, $method, array $userParams, $
                 foreach ($pInstances as $pInstance) {
                     $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
                          $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
-                    if ($pInstanceClass === $type || is_subclass_of($pInstanceClass, $type)) {
+                    if ($pInstanceClass === $type || $isSubclassFunc($pInstanceClass, $type)) {
                         $computedLookupParams[$name] = array($pInstance, $pInstanceClass);
-                        continue;
+                        continue 2;
                     }
                 }
             }
@@ -339,9 +352,9 @@ protected function resolveMethodParameters($class, $method, array $userParams, $
                 foreach ($pInstances as $pInstance) {
                     $pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
                          $this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
-                    if ($pInstanceClass === $type || is_subclass_of($pInstanceClass, $type)) {
+                    if ($pInstanceClass === $type || $isSubclassFunc($pInstanceClass, $type)) {
                         $computedLookupParams[$name] = array($pInstance, $pInstanceClass);
-                        continue;
+                        continue 2;
                     }
                 }
             }

diff --git a/tests/Zend/Di/DependencyInjectorTest.php b/tests/Zend/Di/DependencyInjectorTest.php
@@ -279,4 +279,24 @@ public function testNewInstanceThrowsExceptionWhenEnteringInMiddleOfCircularDepe
         $di->newInstance('ZendTest\Di\TestAsset\CircularClasses\D');
     }
 
+    /**
+     * Fix for PHP bug in is_subclass_of
+     * 
+     * @see https://bugs.php.net/bug.php?id=53727
+     */
+    public function testNewInstanceWillUsePreferredClassForInterfaceHints()
+    {
+        $di = new DependencyInjector();
+        $di->getInstanceManager()->addPreferredInstance(
+            'ZendTest\Di\TestAsset\PreferredImplClasses\A',
+            'ZendTest\Di\TestAsset\PreferredImplClasses\BofA'
+        );
+
+        $c = $di->get('ZendTest\Di\TestAsset\PreferredImplClasses\C');
+        $a = $c->a;
+        $this->assertType('ZendTest\Di\TestAsset\PreferredImplClasses\BofA', $a);
+        $d = $di->get('ZendTest\Di\TestAsset\PreferredImplClasses\D');
+        $this->assertSame($a, $d->a);
+    }
+
 }
diff --git a/tests/Zend/Di/TestAsset/PreferredImplClasses/A.php b/tests/Zend/Di/TestAsset/PreferredImplClasses/A.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ZendTest\Di\TestAsset\PreferredImplClasses;
+
+interface A
+{
+}
diff --git a/tests/Zend/Di/TestAsset/PreferredImplClasses/BofA.php b/tests/Zend/Di/TestAsset/PreferredImplClasses/BofA.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ZendTest\Di\TestAsset\PreferredImplClasses;
+
+class BofA implements A
+{
+}
diff --git a/tests/Zend/Di/TestAsset/PreferredImplClasses/C.php b/tests/Zend/Di/TestAsset/PreferredImplClasses/C.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace ZendTest\Di\TestAsset\PreferredImplClasses;
+
+class C
+{
+    public $a = null;
+    public function setA(A $a)
+    {
+        $this->a = $a;
+    }
+}
diff --git a/tests/Zend/Di/TestAsset/PreferredImplClasses/D.php b/tests/Zend/Di/TestAsset/PreferredImplClasses/D.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace ZendTest\Di\TestAsset\PreferredImplClasses;
+
+class D extends C
+{
+
+}