Alias refactoring

Author: coisa

src/Container/ConfigProvider.php

@@ -13,7 +13,6 @@
 
 namespace CoiSA\ErrorHandler\Container;
 
-use CoiSA\ErrorHandler\Container\Factory\AliasFactory;
 use CoiSA\ErrorHandler\ErrorHandler;
 use CoiSA\ErrorHandler\Handler\DispatchErrorEventThrowableHandler;
 use CoiSA\ErrorHandler\Handler\DispatchThrowableHandler;
@@ -48,10 +47,23 @@ public function __invoke(): array
     public function getDependencies(): array
     {
         return [
+            'aliases'   => $this->getAliases(),
             'factories' => $this->getFactories(),
         ];
     }
 
+    /**
+     * @return array
+     */
+    public function getAliases(): array
+    {
+        return [
+            ThrowableHandlerInterface::class         => ThrowableHandlerAggregate::class,
+            ThrowableResponseFactoryInterface::class => ThrowableResponseFactory::class,
+            ThrowableStreamFactoryInterface::class   => ThrowableStreamFactory::class,
+        ];
+    }
+
     /**
      * @return array
      */
@@ -63,11 +75,8 @@ public function getFactories(): array
             DispatchErrorEventThrowableHandler::class => Factory\DispatchErrorEventThrowableHandlerFactory::class,
             DispatchThrowableHandler::class           => Factory\DispatchThrowableHandlerFactory::class,
             ThrowableHandlerAggregate::class          => Factory\ThrowableHandlerAggregateFactory::class,
-            ThrowableHandlerInterface::class          => new AliasFactory(ThrowableHandlerAggregate::class),
             ThrowableResponseFactory::class           => Factory\ThrowableResponseFactoryFactory::class,
-            ThrowableResponseFactoryInterface::class  => new AliasFactory(ThrowableResponseFactory::class),
             ThrowableStreamFactory::class             => Factory\ThrowableStreamFactoryFactory::class,
-            ThrowableStreamFactoryInterface::class    => new AliasFactory(ThrowableStreamFactory::class),
         ];
     }
 }

src/Container/ErrorHandlerContainer.php

@@ -32,6 +32,11 @@ final class ErrorHandlerContainer implements ContainerInterface
      */
     private $factories;
 
+    /**
+     * @var string[]
+     */
+    private $aliases;
+
     /**
      * @var object[]
      */
@@ -44,7 +49,11 @@ final class ErrorHandlerContainer implements ContainerInterface
      */
     public function __construct(ContainerInterface $container = null)
     {
-        $this->factories = (new ConfigProvider())->getFactories();
+        $configProvider = new ConfigProvider();
+
+        $this->factories = $configProvider->getFactories();
+        $this->aliases   = $configProvider->getAliases();
+
         $this->container = $container;
     }
 
@@ -56,6 +65,7 @@ public function __construct(ContainerInterface $container = null)
     public function has($id)
     {
         return ($this->container && $this->container->has($id))
+            || \array_key_exists($id, $this->aliases)
             || \array_key_exists($id, $this->factories);
     }
 
@@ -99,8 +109,10 @@ private function getFactory(string $id): callable
             throw new Exception\NotFoundException(\sprintf('Factory for class %s was not found', $id));
         }
 
-        $factory = $this->factories[$id];
+        if (isset($this->aliases[$id])) {
+            return new Factory\AliasFactory($this->aliases[$id]);
+        }
 
-        return \is_callable($factory) ? $factory : new $factory();
+        return new $this->factories[$id]();
     }
 }