Merge branch '7.4' into 8.0

* 7.4:
  Fix merge

Author: nicolas-grekas

Tests/Tester/ApplicationTesterTest.php

@@ -101,8 +101,10 @@ public function testShellVerbosityDoesNotOverrideInteractiveAndVerbosity(callabl
             $application = new Application();
             $application->setAutoExit(false);
             $application->register('foo')
-                ->setCode(static function ($input, $output) {
+                ->setCode(static function (InputInterface $input, OutputInterface $output): int {
                     $output->writeln('foo');
+
+                    return 0;
                 })
             ;