activator test cases

Author: featherbits

src/Activator.php

@@ -9,7 +9,6 @@
 use ReflectionMethod;
 use ReflectionFunctionAbstract;
 use ReflectionParameter;
-use Throwable;
 use ReflectionClass;
 use Featherbits\ServiceContainer\Contract\Activator as ActivatorContract;
 
@@ -26,28 +25,20 @@ public function __construct(ContainerContract $container)
 
     public function call(callable $callable)
     {
-        try {
-            $reflection = self::getCallableReflectionFunctionAbstract($callable);
-            return $this->track(self::getFunctionIdentifier($reflection), function () use ($reflection, $callable) {
-                return call_user_func_array($callable, $this->getArguments($reflection));
-            });
-        } catch (Throwable $e) {
-            throw new ContainerException('Failed to call function', 0, $e);
-        }
+        $reflection = self::getCallableReflectionFunctionAbstract($callable);
+        return $this->track(self::getFunctionIdentifier($reflection), function () use ($reflection, $callable) {
+            return call_user_func_array($callable, $this->getArguments($reflection));
+        });
     }
 
     public function instantiate(string $type): object
     {
-        try {
-            return $this->track($type, function () use ($type) {
-                $reflection = new ReflectionClass($type);
-                return ($constructor = $reflection->getConstructor())
-                    ? $reflection->newInstanceArgs($this->getArguments($constructor))
-                    : $reflection->newInstance();
-            });
-        } catch (Throwable $e) {
-            throw new ContainerException('Failed to instantiate ' . $type, 0, $e);
-        }
+        return $this->track($type, function () use ($type) {
+            $reflection = new ReflectionClass($type);
+            return ($constructor = $reflection->getConstructor())
+                ? $reflection->newInstanceArgs($this->getArguments($constructor))
+                : $reflection->newInstance();
+        });
     }
 
     private function track(string $identifier, callable $callable)

tests/ActivatorTest.php

@@ -0,0 +1,49 @@
+<?php
+
+use PHPUnit\Framework\TestCase;
+use Featherbits\ServiceContainer\Container;
+use Featherbits\ServiceContainer\InstanceGetterStrategies\ByFactory;
+use Featherbits\ServiceContainer\Activator;
+
+class ClassWithTestInterfaceParameter
+{
+    public TestInterface $instance;
+
+    public function __construct(TestInterface $instance)
+    {
+        $this->instance = $instance;
+    }
+}
+
+final class ActivatorTest extends TestCase
+{
+    public function testCallCallableWithResolvedParameterFromContainer()
+    {
+        $instance  = new TestClass;
+        $container = new Container();
+        $container->set(TestInterface::class, new ByFactory(function () use ($instance) {
+            return $instance;
+        }));
+
+        $activator = new Activator($container);
+        $instance2 = $activator->call(function (TestInterface $instance) {
+            return $instance;
+        });
+
+        $this->assertSame($instance, $instance2);
+    }
+
+    public function testInstantiateClassWithResolvedParameterFromContainer()
+    {
+        $instance  = new TestClass;
+        $container = new Container();
+        $container->set(TestInterface::class, new ByFactory(function () use ($instance) {
+            return $instance;
+        }));
+
+        $activator = new Activator($container);
+        $instance2 = $activator->instantiate(ClassWithTestInterfaceParameter::class)->instance;
+
+        $this->assertSame($instance, $instance2);
+    }
+}