Merge branch '3.4' into 4.3

* 3.4:
  cs fix
  Replace calls to setExpectedException by Pollyfill

Author: nicolas-grekas

Tests/Parser/ParserTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\CssSelector\Tests\Parser;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
 use Symfony\Component\CssSelector\Node\FunctionNode;
 use Symfony\Component\CssSelector\Node\SelectorNode;
@@ -20,6 +21,8 @@
 
 class ParserTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /** @dataProvider getParserTestData */
     public function testParser($source, $representation)
     {

Tests/Parser/TokenStreamTest.php

@@ -12,11 +12,14 @@
 namespace Symfony\Component\CssSelector\Tests\Parser;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\Parser\TokenStream;
 
 class TokenStreamTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testGetNext()
     {
         $stream = new TokenStream();