Merge branch '6.0' into 6.1

chalasr · chalasr · commit 13a95a5a6907 · 2022-06-08T15:55:35.000+02:00
* 6.0:
  use the outermost wrapping DBAL connection
  [Console] Fix deprecation when description is null
  [Console] Escape % in command name &amp; description from getDefault*()
  [FrameworkBundle] Fix XML cache config
diff --git a/DependencyInjection/AddConsoleCommandPass.php b/DependencyInjection/AddConsoleCommandPass.php
@@ -107,7 +107,7 @@ public function process(ContainerBuilder $container)
                 if (!$r->isSubclassOf(Command::class)) {
                     throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
                 }
-                $description = str_replace('%', '%%', $class::getDefaultDescription());
+                $description = str_replace('%', '%%', $class::getDefaultDescription() ?? '');
             }
 
             if ($description) {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function process(ContainerBuilder $container)`
`107`	`107`	`if (!$r->isSubclassOf(Command::class)) {`
`108`	`108`	`throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));`
`109`	`109`	`}`
`110`		`- $description = str_replace('%', '%%', $class::getDefaultDescription());`
	`110`	`+ $description = str_replace('%', '%%', $class::getDefaultDescription() ?? '');`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if ($description) {`