Merge branch '6.4' into 7.2

* 6.4:
  fix tests
  [FrameworkBundle] Ensure `Email` class exists before using it

Author: xabbuh

Tests/phpt/application.php

@@ -18,8 +18,10 @@
 
 return function (array $context) {
     $command = new Command('go');
-    $command->setCode(function (InputInterface $input, OutputInterface $output) use ($context) {
+    $command->setCode(function (InputInterface $input, OutputInterface $output) use ($context): int {
         $output->write('OK Application '.$context['SOME_VAR']);
+
+        return 0;
     });
 
     $app = new Application();

Tests/phpt/command.php

@@ -19,7 +19,9 @@
 return function (Command $command, InputInterface $input, OutputInterface $output, array $context) {
     $command->addOption('hello', 'e', InputOption::VALUE_REQUIRED, 'How should I greet?', 'OK');
 
-    return $command->setCode(function () use ($input, $output, $context) {
+    return $command->setCode(function () use ($input, $output, $context): int {
         $output->write($input->getOption('hello').' Command '.$context['SOME_VAR']);
+
+        return 0;
     });
 };

Tests/phpt/dotenv_overload_command_debug_exists_0_to_1.php

@@ -20,6 +20,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['DEBUG_ENABLED']);
+
+    return 0;
 });

Tests/phpt/dotenv_overload_command_debug_exists_1_to_0.php

@@ -20,6 +20,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['DEBUG_MODE']);
+
+    return 0;
 });

Tests/phpt/dotenv_overload_command_env_exists.php

@@ -20,6 +20,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['ENV_MODE']);
+
+    return 0;
 });

Tests/phpt/dotenv_overload_command_no_debug.php

@@ -19,6 +19,8 @@
 
 require __DIR__.'/autoload.php';
 
-return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): void {
+return static fn (Command $command, OutputInterface $output, array $context): Command => $command->setCode(static function () use ($output, $context): int {
     $output->writeln($context['DEBUG_ENABLED']);
+
+    return 0;
 });