Merge branch '5.4' into 6.2

* 5.4:
  [Tests] Replace `setMethods()` by `onlyMethods()` and `addMethods()`

Author: nicolas-grekas

Tests/Compiler/MergeExtensionConfigurationPassTest.php

@@ -60,7 +60,7 @@ public function testExpressionLanguageProviderForwarding()
 
     public function testExtensionLoadGetAMergeExtensionConfigurationContainerBuilderInstance()
     {
-        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(['load'])->getMock();
+        $extension = $this->getMockBuilder(FooExtension::class)->onlyMethods(['load'])->getMock();
         $extension->expects($this->once())
             ->method('load')
             ->with($this->isType('array'), $this->isInstanceOf(MergeExtensionConfigurationContainerBuilder::class))
@@ -76,7 +76,7 @@ public function testExtensionLoadGetAMergeExtensionConfigurationContainerBuilder
 
     public function testExtensionConfigurationIsTrackedByDefault()
     {
-        $extension = $this->getMockBuilder(FooExtension::class)->setMethods(['getConfiguration'])->getMock();
+        $extension = $this->getMockBuilder(FooExtension::class)->onlyMethods(['getConfiguration'])->getMock();
         $extension->expects($this->exactly(2))
             ->method('getConfiguration')
             ->willReturn(new FooConfiguration());