[DependencyInjection] Use weak references in ContainerBuilder

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -140,6 +140,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private array $removedBindingIds = [];
 
+    private \WeakReference $containerRef;
+
     private const INTERNAL_TYPES = [
         'int' => true,
         'float' => true,
@@ -1050,13 +1052,14 @@ private function createService(Definition $definition, array &$inlineServices, b
         $parameterBag = $this->getParameterBag();
 
         if (true === $tryProxy && $definition->isLazy() && !$tryProxy = !($proxy = $this->proxyInstantiator ??= new LazyServiceInstantiator()) || $proxy instanceof RealServiceInstantiator) {
+            $containerRef = $this->containerRef ??= \WeakReference::create($this);
             $proxy = $proxy->instantiateProxy(
                 $this,
                 (clone $definition)
                     ->setClass($parameterBag->resolveValue($definition->getClass()))
                     ->setTags(($definition->hasTag('proxy') ? ['proxy' => $parameterBag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags()),
-                $id, function ($proxy = false) use ($definition, &$inlineServices, $id) {
-                    return $this->createService($definition, $inlineServices, true, $id, $proxy);
+                $id, static function ($proxy = false) use ($containerRef, $definition, &$inlineServices, $id) {
+                    return $containerRef->get()->createService($definition, $inlineServices, true, $id, $proxy);
                 }
             );
             $this->shareService($definition, $proxy, $id, $inlineServices);
@@ -1184,34 +1187,38 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo
                 $value[$k] = $this->doResolveServices($v, $inlineServices, $isConstructorArgument);
             }
         } elseif ($value instanceof ServiceClosureArgument) {
+            $containerRef = $this->containerRef ??= \WeakReference::create($this);
             $reference = $value->getValues()[0];
-            $value = fn () => $this->resolveServices($reference);
+            $value = static fn () => $containerRef->get()->resolveServices($reference);
         } elseif ($value instanceof IteratorArgument) {
-            $value = new RewindableGenerator(function () use ($value, &$inlineServices) {
+            $containerRef = $this->containerRef ??= \WeakReference::create($this);
+            $value = new RewindableGenerator(static function () use ($containerRef, $value, &$inlineServices) {
+                $container = $containerRef->get();
                 foreach ($value->getValues() as $k => $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
-                        if (!$this->has($s)) {
+                        if (!$container->has($s)) {
                             continue 2;
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE, $inlineServices)) {
+                        if (!$container->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE, $inlineServices)) {
                             continue 2;
                         }
                     }
 
-                    yield $k => $this->doResolveServices($v, $inlineServices);
+                    yield $k => $container->doResolveServices($v, $inlineServices);
                 }
-            }, function () use ($value): int {
+            }, static function () use ($containerRef, $value): int {
+                $container = $containerRef->get();
                 $count = 0;
                 foreach ($value->getValues() as $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
-                        if (!$this->has($s)) {
+                        if (!$container->has($s)) {
                             continue 2;
                         }
                     }
                     foreach (self::getInitializedConditionals($v) as $s) {
-                        if (!$this->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
+                        if (!$container->doGet($s, ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE)) {
                             continue 2;
                         }
                     }