Merge branch '3.4' into 4.3

* 3.4:
  cs fix
  Replace calls to setExpectedException by Pollyfill

Author: nicolas-grekas

Tests/Command/CachePoolDeleteCommandTest.php

@@ -76,11 +76,7 @@ public function testCommandDeleteFailed()
             ->with('bar')
             ->willReturn(false);
 
-        if (method_exists($this, 'expectExceptionMessage')) {
-            $this->expectExceptionMessage('Cache item "bar" could not be deleted.');
-        } else {
-            $this->setExpectedException('Exception', 'Cache item "bar" could not be deleted.');
-        }
+        $this->expectExceptionMessage('Cache item "bar" could not be deleted.');
 
         $tester = $this->getCommandTester($this->getKernel());
         $tester->execute(['pool' => 'foo', 'key' => 'bar']);

Tests/DependencyInjection/ConfigurationTest.php

@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Connection;
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration;
 use Symfony\Bundle\FullStack;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -24,6 +25,8 @@
 
 class ConfigurationTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testDefaultConfig()
     {
         $processor = new Processor();
@@ -140,12 +143,8 @@ public function provideValidAssetsPackageNameConfigurationTests()
      */
     public function testInvalidAssetsConfiguration(array $assetConfig, $expectedMessage)
     {
-        if (method_exists($this, 'expectException')) {
-            $this->expectException(InvalidConfigurationException::class);
-            $this->expectExceptionMessage($expectedMessage);
-        } else {
-            $this->setExpectedException(InvalidConfigurationException::class, $expectedMessage);
-        }
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage($expectedMessage);
 
         $processor = new Processor();
         $configuration = new Configuration(true);
@@ -194,12 +193,8 @@ public function provideInvalidAssetConfigurationTests()
     public function testItShowANiceMessageIfTwoMessengerBusesAreConfiguredButNoDefaultBus()
     {
         $expectedMessage = 'You must specify the "default_bus" if you define more than one bus.';
-        if (method_exists($this, 'expectException')) {
-            $this->expectException(InvalidConfigurationException::class);
-            $this->expectExceptionMessage($expectedMessage);
-        } else {
-            $this->setExpectedException(InvalidConfigurationException::class, $expectedMessage);
-        }
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage($expectedMessage);
         $processor = new Processor();
         $configuration = new Configuration(true);