Merge branch '6.4' into 7.1

fabpot · fabpot · commit adb9826c4b6c · 2024-10-14T08:12:26.000+02:00
* 6.4:
  [FrameworkBundle] Fix wrong merge
  silence PHP warning when an invalid date interval format string is used
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -113,9 +113,6 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $io = new SymfonyStyle($input, $output);
-        $errorIo = $output instanceof ConsoleOutputInterface ? new SymfonyStyle($input, $output->getErrorOutput()) : $io;
-
         $io = new SymfonyStyle($input, $output);
         $errorIo = $io->getErrorStyle();
 

Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,6 @@ protected function configure(): void`
`113`	`113`
`114`	`114`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`115`	`115`	`{`
`116`		`- $io = new SymfonyStyle($input, $output);`
`117`		`- $errorIo = $output instanceof ConsoleOutputInterface ? new SymfonyStyle($input, $output->getErrorOutput()) : $io;`
`118`		`-`
`119`	`116`	`$io = new SymfonyStyle($input, $output);`
`120`	`117`	`$errorIo = $io->getErrorStyle();`
`121`	`118`