Skip to content

Commit 53399d9

Browse files
Merge branch '6.1' into 6.2
* 6.1: [HttpKernel] Fix empty request stack when terminating with exception [HttpKernel] Remove EOL when using error_log() in HttpKernel Logger [HttpClient] Add test case for seeking into the content of RetryableHttpClient responses [HttpClient] Fix buffering after calling AsyncContext::passthru() s/annd/and s/gargage/garbage [HttpClient] fix merge [HttpClient] Don't override header if is x-www-form-urlencoded [Console] Fix error output on windows cli Reserve keys when using numeric ones add missing Azerbaijani translations fix few typos/inconsistencies in latvian translations Fix TypeError in Router when using UrlGenerator [Messenger] Fix amqp socket lost fix: use message object from event
2 parents c2cf3d6 + 9792ab4 commit 53399d9

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

Application.php

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
264264
$alternative = $alternatives[0];
265265

266266
$style = new SymfonyStyle($input, $output);
267-
$style->block(sprintf("\nCommand \"%s\" is not defined.\n", $name), null, 'error');
267+
$style->block(sprintf('Command "%s" is not defined.', $name), null, 'error', ' ', true);
268268
if (!$style->confirm(sprintf('Do you want to run "%s" instead? ', $alternative), false)) {
269269
if (null !== $this->dispatcher) {
270270
$event = new ConsoleErrorEvent($input, $output, $e);
@@ -918,11 +918,21 @@ protected function configureIO(InputInterface $input, OutputInterface $output)
918918
}
919919

920920
switch ($shellVerbosity = (int) getenv('SHELL_VERBOSITY')) {
921-
case -1: $output->setVerbosity(OutputInterface::VERBOSITY_QUIET); break;
922-
case 1: $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE); break;
923-
case 2: $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE); break;
924-
case 3: $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG); break;
925-
default: $shellVerbosity = 0; break;
921+
case -1:
922+
$output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
923+
break;
924+
case 1:
925+
$output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
926+
break;
927+
case 2:
928+
$output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
929+
break;
930+
case 3:
931+
$output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
932+
break;
933+
default:
934+
$shellVerbosity = 0;
935+
break;
926936
}
927937

928938
if (true === $input->hasParameterOption(['--quiet', '-q'], true)) {

0 commit comments

Comments
 (0)