bug #46442 [FrameworkBundle] Revert "bug #46125 Always add CacheCollectorPass (fancyweb)" (chalasr)

fabpot · fabpot · commit dd36b7c8fc04 · 2022-05-27T08:27:54.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] Revert "bug #46125 Always add CacheCollectorPass (fancyweb)" | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #46416 | License | MIT | Doc PR | - This reverts commit 8b6f56e, reversing changes made to fd1c94b. This change appears to be breaking for some, let's rediscuss it on 6.2. Commits ------- 36d6516 Revert "bug #46125 [FrameworkBundle] Always add CacheCollectorPass (fancyweb)"
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -157,12 +157,12 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new RegisterReverseContainerPass(true));
         $container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);
         $container->addCompilerPass(new SessionPass());
-        $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
`@@ -157,12 +157,12 @@ public function build(ContainerBuilder $container)`
`157`	`157`	`$container->addCompilerPass(new RegisterReverseContainerPass(true));`
`158`	`158`	`$container->addCompilerPass(new RegisterReverseContainerPass(false), PassConfig::TYPE_AFTER_REMOVING);`
`159`	`159`	`$container->addCompilerPass(new SessionPass());`
`160`		`- $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);`
`161`	`160`
`162`	`161`	`if ($container->getParameter('kernel.debug')) {`
`163`	`162`	`$container->addCompilerPass(new AddDebugLogProcessorPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 2);`
`164`	`163`	`$container->addCompilerPass(new UnusedTagsPass(), PassConfig::TYPE_AFTER_REMOVING);`
`165`	`164`	`$container->addCompilerPass(new ContainerBuilderDebugDumpPass(), PassConfig::TYPE_BEFORE_REMOVING, -255);`
	`165`	`+ $container->addCompilerPass(new CacheCollectorPass(), PassConfig::TYPE_BEFORE_REMOVING);`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`