-

nicolas-grekas · nicolas-grekas · commit ae65a7aa1ec7 · 2025-03-02T10:15:01.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -38,6 +38,30 @@ protected function resetService($name): void
         }
         $manager = $this->container->get($name);
 
+        if (\PHP_VERSION_ID >= 80400) {
+            $r = new \ReflectionClass($manager);
+
+            if ($r->isUninitializedLazyObject($manager)) {
+                return;
+            }
+
+            $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
+            ));
+
+            return;
+        }
+
         if ($manager instanceof LazyObjectInterface) {
             if (!$manager->resetLazyObject()) {
                 throw new \LogicException(\sprintf('Resetting a non-lazy manager service is not supported. Declare the "%s" service as lazy.', $name));
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
@@ -57,7 +57,7 @@ public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject =
         }
 
         try {
-            $asGhostObject = (bool) ProxyHelper::generateLazyGhost(new \ReflectionClass($class));
+            $asGhostObject = (bool) ProxyHelper::generateLazyGhost(new \ReflectionClass($class)); // XXX
         } catch (LogicException) {
         }
 
diff --git a/src/Symfony/Component/JsonEncoder/CacheWarmer/LazyGhostCacheWarmer.php b/src/Symfony/Component/JsonEncoder/CacheWarmer/LazyGhostCacheWarmer.php
@@ -24,7 +24,7 @@
  *
  * @internal
  */
-final class LazyGhostCacheWarmer extends CacheWarmer
+final class LazyGhostCacheWarmer extends CacheWarmer // XXX
 {
     private Filesystem $fs;
 
diff --git a/src/Symfony/Component/JsonEncoder/Decode/LazyInstantiator.php b/src/Symfony/Component/JsonEncoder/Decode/LazyInstantiator.php
@@ -85,7 +85,7 @@ public function instantiate(string $className, callable $initializer): object
                 $this->fs->mkdir($this->lazyGhostsDir);
             }
 
-            file_put_contents($path, \sprintf('<?php class %s%s', $lazyClassName, ProxyHelper::generateLazyGhost($classReflection)));
+            file_put_contents($path, \sprintf('<?php class %s%s', $lazyClassName, ProxyHelper::generateLazyGhost($classReflection))); // XXX
         }
 
         require_once $path;

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function isProxyCandidate(Definition $definition, ?bool &$asGhostObject =`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`try {`
`60`		`- $asGhostObject = (bool) ProxyHelper::generateLazyGhost(new \ReflectionClass($class));`
	`60`	`+ $asGhostObject = (bool) ProxyHelper::generateLazyGhost(new \ReflectionClass($class)); // XXX`
`61`	`61`	`} catch (LogicException) {`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @internal`
`26`	`26`	`*/`
`27`		`-final class LazyGhostCacheWarmer extends CacheWarmer`
	`27`	`+final class LazyGhostCacheWarmer extends CacheWarmer // XXX`
`28`	`28`	`{`
`29`	`29`	`private Filesystem $fs;`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function instantiate(string $className, callable $initializer): object`
`85`	`85`	`$this->fs->mkdir($this->lazyGhostsDir);`
`86`	`86`	`}`
`87`	`87`
`88`		`- file_put_contents($path, \sprintf('<?php class %s%s', $lazyClassName, ProxyHelper::generateLazyGhost($classReflection)));`
	`88`	`+ file_put_contents($path, \sprintf('<?php class %s%s', $lazyClassName, ProxyHelper::generateLazyGhost($classReflection))); // XXX`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`require_once $path;`