Update autowiring implementation

src/AutoWiring.php

@@ -3,11 +3,12 @@
 namespace Stratadox\Di;
 
 use Closure;
+use Psr\Container\NotFoundExceptionInterface as NotFound;
 use ReflectionClass as Reflected;
 use ReflectionException;
 use ReflectionType;
 
-final class AutoWiring implements ContainerInterface
+final class AutoWiring implements LinkableContainerInterface
 {
     private $container;
     private $links;
@@ -18,12 +19,12 @@ private function __construct(ContainerInterface $container, array $links)
         $this->links = $links;
     }
 
-    public static function the(ContainerInterface $container): ContainerInterface
+    public static function the(ContainerInterface $container): LinkableContainerInterface
     {
         return new self($container, []);
     }
 
-    public function link(string $interface, string $class) : ContainerInterface
+    public function link(string $interface, string $class): LinkableContainerInterface
     {
         if (!is_a($class, $interface, true)) {
             throw InvalidServiceType::serviceIsNotOfType($class, $interface);
@@ -56,6 +57,7 @@ public function forget(string $service): void
         $this->container->forget($service);
     }
 
+    /** @throws InvalidServiceDefinition|NotFound */
     private function resolve(string $service): void
     {
         try {
@@ -65,6 +67,7 @@ private function resolve(string $service): void
         }
     }
 
+    /** @throws InvalidServiceDefinition|ReflectionException */
     private function resolveThe(Reflected $service): void
     {
         if ($service->isAbstract() || $service->isInterface()) {
@@ -74,6 +77,7 @@ private function resolveThe(Reflected $service): void
         }
     }
 
+    /** @throws InvalidServiceDefinition|ReflectionException */
     private function resolveAbstract(Reflected $service): void
     {
         $name = $service->getName();
@@ -87,6 +91,7 @@ private function resolveAbstract(Reflected $service): void
         });
     }
 
+    /** @throws InvalidServiceDefinition */
     private function resolveClass(Reflected $service): void
     {
         $name = $service->getName();
@@ -107,6 +112,7 @@ private function resolveClass(Reflected $service): void
         });
     }
 
+    /** @throws InvalidServiceDefinition */
     private function handleDependency(ReflectionType $theType): string
     {
         if ($theType->isBuiltin()) {

src/ContainerInterface.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Psr\Container\ContainerInterface as PsrContainerInterface;
+use Psr\Container\NotFoundExceptionInterface as NotFound;
 
 interface ContainerInterface extends PsrContainerInterface
 {
@@ -26,7 +27,7 @@ public function set(string $service, Closure $factory, bool $cache = true): void
      * @return mixed            The service object
      *
      * @throws InvalidServiceDefinition
-     * @throws ServiceNotFound
+     * @throws NotFound
      */
     public function get($service);
 

src/DependenciesCannotBeCircular.php

@@ -7,7 +7,7 @@
 
 final class DependenciesCannotBeCircular extends RuntimeException implements InvalidServiceDefinition
 {
-    public static function loopDetectedIn($serviceName): DependenciesCannotBeCircular
+    public static function loopDetectedIn($serviceName): InvalidServiceDefinition
     {
         return new static(sprintf(
             'Circular dependency loop detected in factory `%s`.',

src/LinkableContainerInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Stratadox\Di;
+
+interface LinkableContainerInterface extends ContainerInterface
+{
+    /**
+     * Links an abstraction to a concrete class.
+     *
+     * @param string $interface           The interface or abstract class.
+     * @param string $class               The concrete class to link to.
+     * @return LinkableContainerInterface The updated container.
+     * @throws InvalidServiceDefinition   When the link is invalid.
+     */
+    public function link(string $interface, string $class): LinkableContainerInterface;
+}