Merge branch '3.4' into 4.3

* 3.4:
  cs fix
  Replace calls to setExpectedException by Pollyfill

Author: nicolas-grekas

Tests/Util/GitRepositoryTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Intl\Tests\Util;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Intl\Exception\RuntimeException;
 use Symfony\Component\Intl\Util\GitRepository;
@@ -21,6 +22,8 @@
  */
 class GitRepositoryTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $targetDir;
 
     const REPO_URL = 'https://github.com/symfony/intl.git';
@@ -39,11 +42,7 @@ protected function cleanup()
 
     public function testItThrowsAnExceptionIfInitialisedWithNonGitDirectory()
     {
-        if (method_exists($this, 'expectException')) {
-            $this->expectException(RuntimeException::class);
-        } else {
-            $this->setExpectedException(RuntimeException::class);
-        }
+        $this->expectException(RuntimeException::class);
 
         @mkdir($this->targetDir, 0777, true);