Activator uses abstract or interface type instances from container

Author: featherbits

src/Activator.php

@@ -35,6 +35,15 @@ public function instantiate(string $type): object
     {
         return $this->track($type, function () use ($type) {
             $reflection = new ReflectionClass($type);
+
+            if ($reflection->isInterface() or $reflection->isAbstract()) {
+                if ($this->container->has($type)) {
+                    return $this->container->get($type);
+                }
+
+                throw new ContainerException('Type [' . $type . '] is not instantiable.');
+            }
+
             return ($constructor = $reflection->getConstructor())
                 ? $reflection->newInstanceArgs($this->getArguments($constructor))
                 : $reflection->newInstance();
@@ -67,7 +76,7 @@ private static function getCallableReflectionFunctionAbstract(callable $callable
             return new ReflectionFunction($callable);
         }
 
-        throw new ContainerException('ReflectionFunctionAbstract for given callable type not implemented');
+        throw new ContainerException('ReflectionFunctionAbstract for given callable type not implemented.');
     }
 
     private static function getFunctionIdentifier(ReflectionFunctionAbstract $reflection): string
@@ -82,7 +91,7 @@ private static function getFunctionIdentifier(ReflectionFunctionAbstract $reflec
             return $reflection->getDeclaringClass()->getName() . '::' . $reflection->getName();
         }
 
-        throw new ContainerException('Function identifier not implemented for reflection of type ' . get_class($reflection));
+        throw new ContainerException('Function identifier not implemented for reflection of type ' . get_class($reflection) . '.');
     }
 
     private function getArguments(ReflectionFunctionAbstract $reflection): array
@@ -115,6 +124,6 @@ private function getArgument(ReflectionParameter $parameter)
             return $this->instantiate($typeName);
         }
 
-        throw new ContainerException('Cannot resolve value for parameter ' . $parameter->getName());
+        throw new ContainerException('Cannot resolve value for parameter [' . $parameter->getName() . '] with type [' . $typeName . '].');
     }
 }

tests/ActivatorTest.php

@@ -4,6 +4,7 @@
 use Featherbits\ServiceContainer\Container;
 use Featherbits\ServiceContainer\InstanceGetterStrategies\ByFactory;
 use Featherbits\ServiceContainer\Activator;
+use Featherbits\ServiceContainer\InstanceGetterStrategies\ByType;
 
 class ClassWithTestInterfaceParameter
 {
@@ -15,6 +16,16 @@ public function __construct(TestInterface $instance)
     }
 }
 
+class ClassWithTestClassParameter
+{
+    public ?TestClass $instance = null;
+    
+    public function __construct(TestClass $instance)
+    {
+        $this->instance = $instance;
+    }
+}
+
 final class ActivatorTest extends TestCase
 {
     public function testCallCallableWithResolvedParameterFromContainer()
@@ -46,4 +57,19 @@ public function testInstantiateClassWithResolvedParameterFromContainer()
 
         $this->assertSame($instance, $instance2);
     }
+
+    public function testInjectClassInstanceAsDependency()
+    {
+        $activator = new Activator(new Container());
+        $instance = $activator->instantiate(ClassWithTestClassParameter::class)->instance;
+        $this->assertInstanceOf(TestClass::class, $instance);
+    }
+
+    public function testInstantiateInterfaceWhenImplementationAddedToContainer()
+    {
+        $container = new Container();
+        $container->set(TestInterface::class, new ByType(TestClass::class));
+        $activator = new Activator($container);
+        $this->assertInstanceOf(TestInterface::class, $activator->instantiate(TestInterface::class));
+    }
 }