Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit f48bf7c1bd1b · 2023-07-13T16:28:09.000+02:00
* 5.4:
  [Security] Allow custom scheme to be used as redirection URIs
  [Validator] Do not mock metadata factory on debug command tests
  [HttpKernel][WebProfilerBundle] Fix search feature
  update Intl component to take into account B-variant when converting Alpha3 to Alpha2. fixing issue with Darwin.
  [VarDumper] Fix dumping `ArrayObject` with `DumpDataCollector`
  [VarDumper] Add tests to demonstrate a bug when dumping ArrayObject with full stack fmk
  [DebugBundle][FrameworkBundle] Fix using the framework without the Console component
  [FrameworkBundle] Add missing monolog channel tag to the `messenger:failed:retry` command
  fetch all known ChoiceType values at once
  [RateLimiter] fix incorrect retryAfter of FixedWindow
  Fix Finder phpdoc
diff --git a/DependencyInjection/DebugExtension.php b/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;
@@ -89,7 +90,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');
         }
     }

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;`
`@@ -89,7 +90,7 @@ public function load(array $configs, ContainerBuilder $container)`
`89`	`90`	`;`
`90`	`91`	`}`
`91`	`92`
`92`		`- if (!class_exists(ServerLogCommand::class)) {`
	`93`	`+ if (!class_exists(Command::class) \|\| !class_exists(ServerLogCommand::class)) {`
`93`	`94`	`$container->removeDefinition('monolog.command.server_log');`
`94`	`95`	`}`
`95`	`96`	`}`