[FrameworkBundle] Fix activation strategy of traceable decorators

nicolas-grekas · nicolas-grekas · commit 307d74308446 · 2025-05-20T13:17:40.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle;
 
+use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AssetsContextPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;
@@ -202,6 +203,14 @@ public function build(ContainerBuilder $container): void
         }
     }
 
+    /**
+     * @internal
+     */
+    public static function considerProfilerEnabled(): bool
+    {
+        return !($GLOBALS['app'] ?? null) instanceof Application || empty($_GET) && \in_array('--profile', $_SERVER['argv'] ?? [], true);
+    }
+
     private function addCompilerPassIfExists(ContainerBuilder $container, string $class, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): void
     {
         $container->addResource(new ClassExistenceResource($class));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/profiling.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Bundle\FrameworkBundle\EventListener\ConsoleProfilerListener;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\HttpKernel\Debug\VirtualRequestStack;
 use Symfony\Component\HttpKernel\EventListener\ProfilerListener;
 use Symfony\Component\HttpKernel\Profiler\FileProfilerStorage;
@@ -61,7 +62,7 @@
         ->set('profiler.state_checker', ProfilerStateChecker::class)
             ->args([
                 service_locator(['profiler' => service('profiler')->ignoreOnUninitialized()]),
-                param('kernel.runtime_mode.web'),
+                inline_service('bool')->factory([FrameworkBundle::class, 'considerProfilerEnabled']),
             ])
 
         ->set('profiler.is_disabled_state_checker', 'Closure')

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bundle\FrameworkBundle;`
`13`	`13`
	`14`	`+use Symfony\Bundle\FrameworkBundle\Console\Application;`
`14`	`15`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddDebugLogProcessorPass;`
`15`	`16`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AssetsContextPass;`
`16`	`17`	`use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ContainerBuilderDebugDumpPass;`
`@@ -202,6 +203,14 @@ public function build(ContainerBuilder $container): void`
`202`	`203`	`}`
`203`	`204`	`}`
`204`	`205`
	`206`	`+ /**`
	`207`	`+ * @internal`
	`208`	`+ */`
	`209`	`+ public static function considerProfilerEnabled(): bool`
	`210`	`+ {`
	`211`	`+ return !($GLOBALS['app'] ?? null) instanceof Application \|\| empty($_GET) && \in_array('--profile', $_SERVER['argv'] ?? [], true);`
	`212`	`+ }`
	`213`	`+`
`205`	`214`	`private function addCompilerPassIfExists(ContainerBuilder $container, string $class, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): void`
`206`	`215`	`{`
`207`	`216`	`$container->addResource(new ClassExistenceResource($class));`