Merge branch '6.1' into 6.2

fabpot · fabpot · commit 16befcdf4ccc · 2022-05-27T08:30:37.000+02:00
* 6.1: [DoctrineBridge] Don't reinit managers when they are proxied as ghost objects Revert "bug #46125 [FrameworkBundle] Always add CacheCollectorPass (fancyweb)"
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -12,14 +12,15 @@
 namespace Symfony\Bridge\Doctrine;
 
 use Doctrine\Persistence\AbstractManagerRegistry;
+use ProxyManager\Proxy\GhostObjectInterface;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Component\DependencyInjection\Container;
 
 /**
  * References Doctrine connections and entity/document managers.
  *
- * @author  Lukas Kahwe Smith <smith@pooteeweet.org>
+ * @author Lukas Kahwe Smith <smith@pooteeweet.org>
  */
 abstract class ManagerRegistry extends AbstractManagerRegistry
 {
@@ -49,6 +50,9 @@ protected function resetService($name): void
         if (!$manager instanceof LazyLoadingInterface) {
             throw new \LogicException('Resetting a non-lazy manager service is not supported. '.(interface_exists(LazyLoadingInterface::class) && class_exists(RuntimeInstantiator::class) ? sprintf('Declare the "%s" service as lazy.', $name) : 'Try running "composer require symfony/proxy-manager-bridge".'));
         }
+        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) {
                 if (isset($this->aliases[$name])) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -163,12 +163,12 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
         $container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new RemoveUnusedSessionMarshallingHandlerPass());
-        $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);
 
         if ($container->getParameter('kernel.debug')) {
             $container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 2);
             $container->addCompilerPass(new UnusedTagsPass(), PassConfig::TYPE_AFTER_REMOVING);
             $container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_BEFORE_REMOVING, -255);
+            $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -163,12 +163,12 @@ public function build(ContainerBuilder $container)`
`163`	`163`	`$container->addCompilerPass(new RegisterReverseContainerPass(true));`
`164`	`164`	`$container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);`
`165`	`165`	`$container->addCompilerPass(new RemoveUnusedSessionMarshallingHandlerPass());`
`166`		`- $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);`
`167`	`166`
`168`	`167`	`if ($container->getParameter('kernel.debug')) {`
`169`	`168`	`$container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 2);`
`170`	`169`	`$container->addCompilerPass(new UnusedTagsPass(), PassConfig::TYPE_AFTER_REMOVING);`
`171`	`170`	`$container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_BEFORE_REMOVING, -255);`
	`171`	`+ $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`