[DebugBundle][FrameworkBundle] Fix using the framework without the Console component

HypeMC · HypeMC · commit feddf407d2c9 · 2023-07-11T23:42:03.000+02:00
diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
@@ -14,6 +14,7 @@
 use Symfony\Bridge\Monolog\Command\ServerLogCommand;
 use Symfony\Bundle\DebugBundle\Command\ServerDumpPlaceholderCommand;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
@@ -92,7 +93,7 @@ public function load(array $configs, ContainerBuilder $container)
             ;
         }
 
-        if (!class_exists(ServerLogCommand::class)) {
+        if (!class_exists(Command::class) || !class_exists(ServerLogCommand::class)) {
             $container->removeDefinition('monolog.command.server_log');
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2154,12 +2154,14 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             ->replaceArgument(0, $transportRetryReferences);
 
         if (\count($failureTransports) > 0) {
-            $container->getDefinition('console.command.messenger_failed_messages_retry')
-                ->replaceArgument(0, $config['failure_transport']);
-            $container->getDefinition('console.command.messenger_failed_messages_show')
-                ->replaceArgument(0, $config['failure_transport']);
-            $container->getDefinition('console.command.messenger_failed_messages_remove')
-                ->replaceArgument(0, $config['failure_transport']);
+            if ($this->hasConsole()) {
+                $container->getDefinition('console.command.messenger_failed_messages_retry')
+                    ->replaceArgument(0, $config['failure_transport']);
+                $container->getDefinition('console.command.messenger_failed_messages_show')
+                    ->replaceArgument(0, $config['failure_transport']);
+                $container->getDefinition('console.command.messenger_failed_messages_remove')
+                    ->replaceArgument(0, $config['failure_transport']);
+            }
 
             $failureTransportsByTransportNameServiceLocator = ServiceLocatorTagPass::register($container, $failureTransportReferencesByTransportName);
             $container->getDefinition('messenger.failure.send_failed_message_to_failure_transport_listener')

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Symfony\Bridge\Monolog\Command\ServerLogCommand;`
`15`	`15`	`use Symfony\Bundle\DebugBundle\Command\ServerDumpPlaceholderCommand;`
`16`	`16`	`use Symfony\Component\Config\FileLocator;`
	`17`	`+use Symfony\Component\Console\Command\Command;`
`17`	`18`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
`18`	`19`	`use Symfony\Component\DependencyInjection\Extension\Extension;`
`19`	`20`	`use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;`
`@@ -92,7 +93,7 @@ public function load(array $configs, ContainerBuilder $container)`
`92`	`93`	`;`
`93`	`94`	`}`
`94`	`95`
`95`		`- if (!class_exists(ServerLogCommand::class)) {`
	`96`	`+ if (!class_exists(Command::class) \|\| !class_exists(ServerLogCommand::class)) {`
`96`	`97`	`$container->removeDefinition('monolog.command.server_log');`
`97`	`98`	`}`
`98`	`99`	`}`