Merge pull request #156 from shadowhand/fix/never-cache-closure-params

Prevent caching of delegate closures

Author: bwoebi

lib/CachingReflector.php

@@ -75,7 +75,7 @@ public function getParamTypeHint(\ReflectionFunctionAbstract $function, \Reflect
             $paramCacheKey = self::CACHE_KEY_CLASSES . "{$lowClass}.{$lowMethod}.param-{$lowParam}";
         } else {
             $lowFunc = strtolower($function->name);
-            $paramCacheKey = ($lowFunc !== '{closure}')
+            $paramCacheKey = (strpos($lowFunc, '{closure}') === false)
                 ? self::CACHE_KEY_FUNCS . ".{$lowFunc}.param-{$lowParam}"
                 : null;
         }

test/InjectorTest.php

@@ -1112,4 +1112,21 @@ public function testChildWithoutConstructorMissingParam() {
         $injector->define('Auryn\Test\ParentWithConstructor', array(':foo' => 'parent'));
         $injector->make('Auryn\Test\ChildWithoutConstructor');
     }
+
+    public function testInstanceClosureDelegates()
+    {
+        $injector = new Injector;
+        $injector->delegate('Auryn\Test\DelegatingInstanceA', function (DelegateA $d) {
+            return new \Auryn\Test\DelegatingInstanceA($d);
+        });
+        $injector->delegate('Auryn\Test\DelegatingInstanceB', function (DelegateB $d) {
+            return new \Auryn\Test\DelegatingInstanceB($d);
+        });
+
+        $a = $injector->make('Auryn\Test\DelegatingInstanceA');
+        $b = $injector->make('Auryn\Test\DelegatingInstanceB');
+
+        $this->assertInstanceOf('Auryn\Test\DelegateA', $a->a);
+        $this->assertInstanceOf('Auryn\Test\DelegateB', $b->b);
+    }
 }

test/fixtures.php

@@ -713,3 +713,17 @@ function __construct($foo) {
 
 class ChildWithoutConstructor extends ParentWithConstructor {
 }
+
+class DelegateA {}
+class DelegatingInstanceA {
+    public function __construct(DelegateA $a) {
+        $this->a = $a;
+    }
+}
+
+class DelegateB {}
+class DelegatingInstanceB {
+    public function __construct(DelegateB $b) {
+        $this->b = $b;
+    }
+}