Tidied generic method caller.

Typed arguments passed as strings are resolved.
ntentan · Sep 3, 2017 · 714c382 · 714c382
1 parent fcc7b04
commit 714c382
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/Container.php b/src/Container.php
@@ -66,21 +66,29 @@ public function resolve($type, $constructorArguments = [])
 
         foreach($resolvedClass['calls'] ?? [] as $method => $parameters) {
             $method = new \ReflectionMethod($instance, $method);
-            $method->invokeArgs($instance, $this->getConstructorArguments($method, $parameters));
+            $method->invokeArgs($instance, $this->getMethodArguments($method, $parameters));
         }
 
         return $instance;
     }
 
-    private function getConstructorArguments($constructor, $constructorArguments)
+    private function resolveArgument($argument, $class)
+    {
+        if($class && is_string($argument)) {
+            return $this->resolve($argument);
+        }
+        return $argument;
+    }
+
+    private function getMethodArguments($method, $methodArguments)
     {
         $argumentValues = [];
-        $parameters = $constructor->getParameters();
+        $parameters = $method->getParameters();
         foreach ($parameters as $parameter) {
             $class = $parameter->getClass();
             $className = $class ? $class->getName() : null;
-            if (isset($constructorArguments[$parameter->getName()])) {
-                $argumentValues[] = $constructorArguments[$parameter->getName()];
+            if (isset($methodArguments[$parameter->getName()])) {
+                $argumentValues[] = $this->resolveArgument($methodArguments[$parameter->getName()], $className);
             } else {
                 $argumentValues[] = $className ? $this->resolve($className) : null;
             }
@@ -109,6 +117,6 @@ private function getInstance($className, $constructorArguments = [])
             );
         }
         $constructor = $reflection->getConstructor();
-        return $reflection->newInstanceArgs($constructor ? $this->getConstructorArguments($constructor, $constructorArguments) : []);
+        return $reflection->newInstanceArgs($constructor ? $this->getMethodArguments($constructor, $constructorArguments) : []);
     }
 }