diff --git a/DependencyInjection/AddConsoleCommandPass.php b/DependencyInjection/AddConsoleCommandPass.php
index efaf39a2c..cfb204941 100644
--- a/DependencyInjection/AddConsoleCommandPass.php
+++ b/DependencyInjection/AddConsoleCommandPass.php
@@ -50,7 +50,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));
}
- $aliases = $class::getDefaultName();
+ $aliases = str_replace('%', '%%', $class::getDefaultName() ?? '');
}
$aliases = explode('|', $aliases ?? '');
@@ -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 = $class::getDefaultDescription();
+ $description = str_replace('%', '%%', $class::getDefaultDescription() ?? '');
}
if ($description) {
diff --git a/Tester/ApplicationTester.php b/Tester/ApplicationTester.php
index 0404020c6..275a30500 100644
--- a/Tester/ApplicationTester.php
+++ b/Tester/ApplicationTester.php
@@ -49,17 +49,37 @@ public function __construct(Application $application)
*/
public function run(array $input, array $options = []): int
{
- $this->input = new ArrayInput($input);
- if (isset($options['interactive'])) {
- $this->input->setInteractive($options['interactive']);
- }
+ $prevShellVerbosity = getenv('SHELL_VERBOSITY');
- if ($this->inputs) {
- $this->input->setStream(self::createStream($this->inputs));
- }
+ try {
+ $this->input = new ArrayInput($input);
+ if (isset($options['interactive'])) {
+ $this->input->setInteractive($options['interactive']);
+ }
- $this->initOutput($options);
+ if ($this->inputs) {
+ $this->input->setStream(self::createStream($this->inputs));
+ }
- return $this->statusCode = $this->application->run($this->input, $this->output);
+ $this->initOutput($options);
+
+ return $this->statusCode = $this->application->run($this->input, $this->output);
+ } finally {
+ // SHELL_VERBOSITY is set by Application::configureIO so we need to unset/reset it
+ // to its previous value to avoid one test's verbosity to spread to the following tests
+ if (false === $prevShellVerbosity) {
+ if (\function_exists('putenv')) {
+ @putenv('SHELL_VERBOSITY');
+ }
+ unset($_ENV['SHELL_VERBOSITY']);
+ unset($_SERVER['SHELL_VERBOSITY']);
+ } else {
+ if (\function_exists('putenv')) {
+ @putenv('SHELL_VERBOSITY='.$prevShellVerbosity);
+ }
+ $_ENV['SHELL_VERBOSITY'] = $prevShellVerbosity;
+ $_SERVER['SHELL_VERBOSITY'] = $prevShellVerbosity;
+ }
+ }
}
}
diff --git a/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/Tests/DependencyInjection/AddConsoleCommandPassTest.php
index aa92c76f1..eec4eff43 100644
--- a/Tests/DependencyInjection/AddConsoleCommandPassTest.php
+++ b/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -153,6 +153,33 @@ public function testProcessFallsBackToDefaultDescription()
$this->assertSame(1 + $initCounter, DescribedCommand::$initCounter);
}
+ public function testEscapesDefaultFromPhp()
+ {
+ $container = new ContainerBuilder();
+ $container
+ ->register('to-escape', EscapedDefaultsFromPhpCommand::class)
+ ->addTag('console.command')
+ ;
+
+ $pass = new AddConsoleCommandPass();
+ $pass->process($container);
+
+ $commandLoader = $container->getDefinition('console.command_loader');
+ $commandLocator = $container->getDefinition((string) $commandLoader->getArgument(0));
+
+ $this->assertSame(ContainerCommandLoader::class, $commandLoader->getClass());
+ $this->assertSame(['%%cmd%%' => 'to-escape', '%%cmdalias%%' => 'to-escape'], $commandLoader->getArgument(1));
+ $this->assertEquals([['to-escape' => new ServiceClosureArgument(new Reference('.to-escape.lazy'))]], $commandLocator->getArguments());
+ $this->assertSame([], $container->getParameter('console.command.ids'));
+
+ $command = $container->get('console.command_loader')->get('%%cmd%%');
+
+ $this->assertInstanceOf(LazyCommand::class, $command);
+ $this->assertSame('%cmd%', $command->getName());
+ $this->assertSame(['%cmdalias%'], $command->getAliases());
+ $this->assertSame('Creates a 80% discount', $command->getDescription());
+ }
+
public function testProcessThrowAnExceptionIfTheServiceIsAbstract()
{
$this->expectException(\InvalidArgumentException::class);
@@ -286,6 +313,12 @@ class NamedCommand extends Command
protected static $defaultName = 'default';
}
+class EscapedDefaultsFromPhpCommand extends Command
+{
+ protected static $defaultName = '%cmd%|%cmdalias%';
+ protected static $defaultDescription = 'Creates a 80% discount';
+}
+
class DescribedCommand extends Command
{
public static $initCounter = 0;
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy