Add container proxy

src/CompositeContainer.php

@@ -42,10 +42,15 @@ public function has($id)
 
  /**
  * Attaches a container to the composite container.
+ * When $delegateLookup set to true, dependencies will be looked for in composite container instead of
+ * in $container directly. When set to false, dependencies would be looked for in $container only.
  * @param ContainerInterface $container
  */
- public function attach(ContainerInterface $container): void
+ public function attach(ContainerInterface $container, bool $delegateLookup = false): void
  {
+ if ($delegateLookup && $container instanceof ContainerDelegateInterface) {
+ $container = $container->withRootContainer($this);
+ }
  array_unshift($this->containers, $container);
  }
 

src/Container.php

@@ -17,7 +17,7 @@
 /**
  * Container implements a [dependency injection](https://en.wikipedia.org/wiki/Dependency_injection) container.
  */
-class Container implements ContainerInterface
+class Container implements ContainerInterface, ContainerDelegateInterface
 {
  /**
  * @var DefinitionInterface[] object definitions indexed by their types
@@ -34,6 +34,8 @@ class Container implements ContainerInterface
  */
  private $instances;
 
+ private ?ContainerInterface $rootContainer = null;
+
  /**
  * Container constructor.
  *
@@ -48,9 +50,22 @@ public function __construct(
  array $providers = []
  ) {
  $this->setMultiple($definitions);
- foreach ($providers as $provider) {
- $this->addProvider($provider);
+ $this->registerServiceProviders($providers);
+ }
+
+ public function withRootContainer(ContainerInterface $container): ContainerInterface
+ {
+ $newContainer = clone $this;
+
+ if ($this->rootContainer === null) {
+ $newContainer->rootContainer = new CompositeContainer();
+ } else {
+ $rootContainer = $this->rootContainer;
+ $newContainer->rootContainer = clone $rootContainer;
  }
+ $newContainer->rootContainer->attach($container);
+
+ return $newContainer;
  }
 
  /**
@@ -124,7 +139,7 @@ private function buildInternal(string $id, array $params = [])
  }
  $this->processDefinition($this->definitions[$id]);
 
- return $this->definitions[$id]->resolve($this, $params);
+ return $this->definitions[$id]->resolve($this->rootContainer ?? $this, $params);
  }
 
  protected function processDefinition($definition): void
@@ -134,7 +149,6 @@ protected function processDefinition($definition): void
  }
  }
 
-
  /**
  * @param string $class
  * @param array $params
@@ -148,7 +162,7 @@ private function buildPrimitive(string $class, array $params = [])
  if (class_exists($class)) {
  $definition = new ArrayDefinition($class);
 
- return $definition->resolve($this, $params);
+ return $definition->resolve($this->rootContainer ?? $this, $params);
  }
 
  throw new NotFoundException("No definition for $class");
@@ -179,6 +193,13 @@ public function setMultiple(array $config): void
  }
  }
 
+ public function registerServiceProviders(array $providers): void
+ {
+ foreach ($providers as $provider) {
+ $this->addProvider($provider);
+ }
+ }
+
  /**
  * Returns a value indicating whether the container has the definition of the specified name.
  * @param string $id class name, interface name or alias name

src/ContainerBuilder.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Yiisoft\Di;
+
+use Psr\Container\ContainerInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Yiisoft\Factory\Factory;
+
+final class ContainerBuilder
+{
+ private ContainerInterface $container;
+
+ private ?ContainerProxyInterface $containerProxy = null;
+
+ private array $decoratedServices = [];
+
+ public function __construct(ContainerInterface $container)
+ {
+ $this->container = $container;
+ }
+
+ public function setContainerProxy(ContainerProxyInterface $containerProxy): self
+ {
+ $this->containerProxy = $containerProxy;
+ return $this;
+ }
+
+ public function registerDefinitions(array $definitions): self
+ {
+ if ($this->container instanceof Container || $this->container instanceof Factory) {
+ $this->container->setMultiple($definitions);
+ return $this;
+ }
+
+ throw new \RuntimeException('This method is for Yiisoft\Di\Container and Yiisoft\Factory\Factory only');
+ }
+
+ public function registerServiceProviders(array $providers): self
+ {
+ if ($this->container instanceof Container) {
+ $this->container->registerServiceProviders($providers);
+ return $this;
+ }
+
+ throw new \RuntimeException('This method is for Yiisoft\Di\Container only');
+ }
+
+ public function addDecoratedService(string $service, $decoration = null): self
+ {
+ if ($decoration === null) {
+ $this->decoratedServices[] = $service;
+ } else {
+ $this->decoratedServices[$service] = $decoration;
+ }
+ return $this;
+ }
+
+ public function build()
+ {
+ if ($this->containerProxy !== null) {
+ $this->containerProxy = $this->containerProxy->withDecoratedServices($this->decoratedServices);
+ } elseif ($this->containerProxy === null && $this->container->has(ContainerProxyInterface::class)) {
+ try {
+ $containerProxy = $this->container->get(ContainerProxyInterface::class);
+ if ($containerProxy) {
+ $this->containerProxy = $containerProxy->withDecoratedServices($this->decoratedServices);
+ }
+ } catch (ContainerExceptionInterface $e) {
+ $this->containerProxy = null;
+ }
+ }
+
+ return $this->getContainer();
+ }
+
+ private function getContainer(): ContainerInterface
+ {
+ return $this->hasActiveProxy() ? $this->containerProxy : $this->container;
+ }
+
+ private function hasActiveProxy(): bool
+ {
+ return $this->containerProxy !== null && $this->containerProxy->isActive();
+ }
+}

src/ContainerDelegateInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Yiisoft\Di;
+
+use Psr\Container\ContainerInterface;
+
+interface ContainerDelegateInterface
+{
+ public function withRootContainer(ContainerInterface $container): ContainerInterface;
+}

src/ContainerProxyInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Yiisoft\Di;
+
+use Psr\Container\ContainerInterface;
+
+interface ContainerProxyInterface extends ContainerInterface
+{
+ public function isActive(): bool;
+
+ public function withDecoratedServices(array $decoratedServices): ContainerProxyInterface;
+}