Merge branch '3.4' into 4.3

* 3.4:
  [Cache] fix cs
  Make tests support phpunit 8

Author: nicolas-grekas

Tests/LexerTest.php

@@ -12,18 +12,21 @@
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\ExpressionLanguage\Lexer;
 use Symfony\Component\ExpressionLanguage\Token;
 use Symfony\Component\ExpressionLanguage\TokenStream;
 
 class LexerTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var Lexer
      */
     private $lexer;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->lexer = new Lexer();
     }