Merge branch '7.4' into 8.0

* 7.4:
  Fix merge
  [HttpKernel] Make `#[Cache]` respect all explicit cache directives set in controller
  Revert "bug #62541 [DependencyInjection] Reset resolved state when setting a parameter (yoeunes)"

Author: nicolas-grekas

Tests/ApplicationTest.php

@@ -2646,7 +2646,7 @@ public function testDoesNotFindHiddenCommandAsAlternativeIfHelpOptionIsPresent()
     {
         $application = new Application();
         $application->setAutoExit(false);
-        $application->add(new \FooHiddenCommand());
+        $application->addCommand(new \FooHiddenCommand());
 
         $tester = new ApplicationTester($application);
         $tester->setInputs(['yes']);
@@ -2662,7 +2662,7 @@ public function testsPreservedHelpOptionWhenItsAnAlternative()
     {
         $application = new Application();
         $application->setAutoExit(false);
-        $application->add(new \FoobarCommand());
+        $application->addCommand(new \FoobarCommand());
 
         $tester = new ApplicationTester($application);
         $tester->setInputs(['yes']);