Added method updating container config

quillstack · Jan 13, 2022 · fad2eac · fad2eac
1 parent 897ace4
commit fad2eac
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 40 deletions.
diff --git a/src/Container.php b/src/Container.php
@@ -22,42 +22,26 @@ class Container implements ContainerInterface
 {
     /**
      * Instances array.
-     *
-     * @var array
      */
     private array $instances = [];
 
     /**
      * Current classes stack to detect loops.
-     *
-     * @var array
      */
     private array $stack = [];
 
     /**
      * Instance factory to create new instances.
-     *
-     * @var InstanceFactory
      */
     private InstanceFactory $instanceFactory;
 
     /**
      * Configuration for interfaces and parameters.
-     *
-     * @var array
      */
     private array $config;
 
-    /**
-     * @var Container
-     */
     private static Container $instance;
 
-    /**
-     * Container constructor.
-     *
-     * @param array $config
-     */
     public function __construct(array $config = [])
     {
         $this->config = $config;
@@ -96,8 +80,6 @@ public function has($id): bool
 
     /**
      * Method to create a new instance.
-     *
-     * @param $id
      */
     private function createNewInstance(string $id): void
     {
@@ -110,20 +92,21 @@ private function createNewInstance(string $id): void
         try {
             $this->instances[$id] = $this->instanceFactory->create($id);
         } catch (ReflectionException $exception) {
+            array_pop($this->stack);
             $message = "Unable to create reflection class for `{$id}`";
 
             throw new UnableToCreateReflectionClassException($message, 500, $exception);
+        } catch (\Exception $exception) {
+            array_pop($this->stack);
+
+            throw $exception;
         }
 
         Container::$instance = $this;
     }
 
     /**
      * Gets a class name for the given interface from the configuration.
-     *
-     * @param string $interface
-     *
-     * @return string
      */
     public function getInstantiableClassForInterface(string $interface): string
     {
@@ -146,11 +129,6 @@ public function getInstantiableClassForInterface(string $interface): string
 
     /**
      * Gets a parameter value for the given name from the configuration.
-     *
-     * @param string $className
-     * @param string $parameterName
-     *
-     * @return mixed
      */
     public function getParameterForClass(string $className, string $parameterName): mixed
     {
@@ -161,11 +139,6 @@ public function getParameterForClass(string $className, string $parameterName):
         return $this->config[$className][$parameterName];
     }
 
-    /**
-     * @param string $classNameOrInterface
-     *
-     * @return string|null
-     */
     public function getCustomFactoryClassName(string $classNameOrInterface): ?string
     {
         if (!class_exists($classNameOrInterface) && !interface_exists($classNameOrInterface)) {
@@ -196,11 +169,6 @@ public function getCustomFactoryClassName(string $classNameOrInterface): ?string
         return null;
     }
 
-    /**
-     * @param string $id
-     *
-     * @return string|null
-     */
     private function getPotentialClassFactory(string $id): ?string
     {
         $class = $this->config[$id];
@@ -220,9 +188,6 @@ private function getPotentialClassFactory(string $id): ?string
         return null;
     }
 
-    /**
-     * @return Container
-     */
     public static function getInstance(): Container
     {
         if (!isset(Container::$instance)) {
@@ -241,4 +206,9 @@ public function getValue(string $id): object
     {
         return $this->config[$id];
     }
+
+    public function addToConfig(array $config = []): void
+    {
+        $this->config += $config;
+    }
 }
diff --git a/tests/Mocks/Config/MockClass.php b/tests/Mocks/Config/MockClass.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Quillstack\DI\Tests\Mocks\Config;
+
+class MockClass
+{
+    //
+}
diff --git a/tests/Mocks/Config/MockInterface.php b/tests/Mocks/Config/MockInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Quillstack\DI\Tests\Mocks\Config;
+
+interface MockInterface
+{
+    //
+}
diff --git a/tests/Unit/TestAddToConfig.php b/tests/Unit/TestAddToConfig.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Quillstack\DI\Tests\Unit;
+
+use Quillstack\DI\Container;
+use Quillstack\DI\Exceptions\InterfaceDefinitionNotFoundException;
+use Quillstack\DI\Tests\Mocks\Config\MockClass;
+use Quillstack\DI\Tests\Mocks\Config\MockInterface;
+use Quillstack\UnitTests\AssertEqual;
+use Quillstack\UnitTests\AssertExceptions;
+
+class TestAddToConfig
+{
+    private Container $container;
+
+    public function __construct(private AssertExceptions $assertExceptions, private AssertEqual $assertEqual)
+    {
+        $this->container = new Container();
+    }
+
+    public function expectNoInterfaceInConfig()
+    {
+        $this->assertExceptions->expect(InterfaceDefinitionNotFoundException::class);
+
+        $this->container->get(MockInterface::class);
+    }
+
+    public function addToConfig()
+    {
+        $this->container->addToConfig([
+            MockInterface::class => MockClass::class,
+        ]);
+
+        $mockClass = $this->container->get(MockInterface::class);
+
+        $this->assertEqual->equal($mockClass, new MockClass());
+    }
+}
diff --git a/tests/unit.php b/tests/unit.php
@@ -10,4 +10,6 @@
     \Quillstack\DI\Tests\Unit\InstanceFactories\TestClassFromInterfaceFactory::class,
     \Quillstack\DI\Tests\Unit\InstanceFactories\TestExternalInstanceFactory::class,
     \Quillstack\DI\Tests\Unit\InstanceFactories\TestInstantiableClassFactory::class,
+
+    \Quillstack\DI\Tests\Unit\TestAddToConfig::class,
 ];