Add append and prepend methods o AggregateContainer

Author: coisa

src/AggregateContainer.php

@@ -65,6 +65,30 @@ public function __construct(ContainerInterface ...$containers)
         ];
     }
 
+    /**
+     * Appends a container to the end of the aggregated list.
+     *
+     * This method MAY be used to dynamically expand the resolution pool.
+     *
+     * @param ContainerInterface $container the container to append
+     */
+    public function append(ContainerInterface $container): void
+    {
+        $this->containers[] = $container;
+    }
+
+    /**
+     * Prepends a container to the beginning of the aggregated list.
+     *
+     * This method MAY be used to prioritize a container during resolution.
+     *
+     * @param ContainerInterface $container the container to prepend
+     */
+    public function prepend(ContainerInterface $container): void
+    {
+        array_unshift($this->containers, $container);
+    }
+
     /**
      * Determines whether a service identifier can be resolved.
      *

src/Factory/ContainerFactory.php

@@ -73,12 +73,14 @@ public function __invoke(ContainerInterface ...$containers): ContainerInterface
             $dependencies = $dependencies->toArray();
         }
 
-        // Add an autowire-based container using provided dependencies.
-        $containers[] = new Container($dependencies);
-
-        return new AggregateContainer(
+        $container = new AggregateContainer(
             new ConfigContainer($this->config),
             ...$containers,
         );
+
+        // Add an autowire-based container using provided dependencies.
+        $container->append(new Container(definitions: $dependencies, wrapperContainer: $container));
+
+        return $container;
     }
 }

tests/AggregateContainerTest.php

@@ -158,4 +158,45 @@ public function testGetThrowsWhenNoContainerCanResolve(): void
 
         $container->get($key);
     }
+
+    #[Test]
+    public function testAppendAddsContainerAtTheEnd(): void
+    {
+        $key   = uniqid('svc_', true);
+        $value = uniqid('val_', true);
+
+        $first = $this->prophesize(ContainerInterface::class);
+        $first->has($key)->willReturn(false);
+
+        $second = $this->prophesize(ContainerInterface::class);
+        $second->has($key)->willReturn(true);
+        $second->get($key)->willReturn($value);
+
+        $container = new AggregateContainer($first->reveal());
+        $container->append($second->reveal());
+
+        self::assertTrue($container->has($key));
+        self::assertSame($value, $container->get($key));
+    }
+
+    #[Test]
+    public function testPrependAddsContainerAtTheBeginning(): void
+    {
+        $key   = uniqid('service_', true);
+        $value = uniqid('val_', true);
+
+        $first = $this->prophesize(ContainerInterface::class);
+        $first->has($key)->willReturn(true);
+        $first->get($key)->willReturn($value);
+
+        $second = $this->prophesize(ContainerInterface::class);
+        $second->has($key)->willReturn(true);
+        $second->get($key)->willReturn('incorrect');
+
+        $container = new AggregateContainer($second->reveal());
+        $container->prepend($first->reveal());
+
+        self::assertTrue($container->has($key));
+        self::assertSame($value, $container->get($key));
+    }
 }