[DependencyInjection] Leverage native lazy objects for lazy services

Author: nicolas-grekas

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.3
+---
+
+ * Reset the manager registry using native lazy objects when applicable
+
 7.2
 ---
 

ManagerRegistry.php

@@ -45,31 +45,60 @@ protected function resetService($name): void
 
             return;
         }
-        if (!$manager instanceof LazyLoadingInterface) {
-            throw new \LogicException(\sprintf('Resetting a non-lazy manager service is not supported. Declare the "%s" service as lazy.', $name));
+        if (\PHP_VERSION_ID < 80400) {
+            if (!$manager instanceof LazyLoadingInterface) {
+                throw new \LogicException(\sprintf('Resetting a non-lazy manager service is not supported. Declare the "%s" service as lazy.', $name));
+            }
+            trigger_deprecation('symfony/doctrine-bridge', '7.3', 'Support for proxy-manager is deprecated.');
+
+            if ($manager instanceof GhostObjectInterface) {
+                throw new \LogicException('Resetting a lazy-ghost-object manager service is not supported.');
+            }
+            $manager->setProxyInitializer(\Closure::bind(
+                function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
+                    $name = $this->aliases[$name] ?? $name;
+                    $wrappedInstance = match (true) {
+                        isset($this->fileMap[$name]) => $this->load($this->fileMap[$name], false),
+                        (new \ReflectionMethod($this, $method = $this->methodMap[$name]))->isStatic() => $this->{$method}($this, false),
+                        default => $this->{$method}(false),
+                    };
+                    $manager->setProxyInitializer(null);
+
+                    return true;
+                },
+                $this->container,
+                Container::class
+            ));
+
+            return;
         }
-        if ($manager instanceof GhostObjectInterface) {
-            throw new \LogicException('Resetting a lazy-ghost-object manager service is not supported.');
+
+        $r = new \ReflectionClass($manager);
+
+        if ($r->isUninitializedLazyObject($manager)) {
+            return;
+        }
+
+        try {
+            $r->resetAsLazyProxy($manager, \Closure::bind(
+                function () use ($name) {
+                    $name = $this->aliases[$name] ?? $name;
+
+                    return match (true) {
+                        isset($this->fileMap[$name]) => $this->load($this->fileMap[$name], false),
+                        (new \ReflectionMethod($this, $method = $this->methodMap[$name]))->isStatic() => $this->{$method}($this, false),
+                        default => $this->{$method}(false),
+                    };
+                },
+                $this->container,
+                Container::class
+            ));
+        } catch (\Error $e) {
+            if (__FILE__ !== $e->getFile()) {
+                throw $e;
+            }
+
+            throw new \LogicException(\sprintf('Resetting a non-lazy manager service is not supported. Declare the "%s" service as lazy.', $name), 0, $e);
         }
-        $manager->setProxyInitializer(\Closure::bind(
-            function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
-                if (isset($this->aliases[$name])) {
-                    $name = $this->aliases[$name];
-                }
-                if (isset($this->fileMap[$name])) {
-                    $wrappedInstance = $this->load($this->fileMap[$name], false);
-                } elseif ((new \ReflectionMethod($this, $this->methodMap[$name]))->isStatic()) {
-                    $wrappedInstance = $this->{$this->methodMap[$name]}($this, false);
-                } else {
-                    $wrappedInstance = $this->{$this->methodMap[$name]}(false);
-                }
-
-                $manager->setProxyInitializer(null);
-
-                return true;
-            },
-            $this->container,
-            Container::class
-        ));
     }
 }