Merge branch '3.4' into 4.3

* 3.4:
  cs fix
  Replace calls to setExpectedException by Pollyfill

Author: nicolas-grekas

Tests/Authorization/AccessDecisionManagerTest.php

@@ -12,11 +12,14 @@
 namespace Symfony\Component\Security\Core\Tests\Authorization;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
 class AccessDecisionManagerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @expectedException \InvalidArgumentException
      */