Merge branch '3.4' into 4.3

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

Author: nicolas-grekas

Tests/Generator/Dumper/PhpGeneratorDumperTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Routing\Tests\Generator\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
@@ -23,6 +24,8 @@
  */
 class PhpGeneratorDumperTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var RouteCollection
      */
@@ -43,7 +46,7 @@ class PhpGeneratorDumperTest extends TestCase
      */
     private $largeTestTmpFilepath;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
@@ -55,7 +58,7 @@ protected function setUp()
         @unlink($this->largeTestTmpFilepath);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         parent::tearDown();
 

Tests/Loader/AnnotationClassLoaderTest.php

@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Routing\Route;
@@ -40,12 +41,14 @@
 
 class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var AnnotationClassLoader
      */
     private $loader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $reader = new AnnotationReader();
         $this->loader = new class($reader) extends AnnotationClassLoader {

Tests/Loader/AnnotationDirectoryLoaderTest.php

@@ -11,15 +11,18 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 
 class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest
 {
+    use ForwardCompatTestTrait;
+
     protected $loader;
     protected $reader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

Tests/Loader/AnnotationFileLoaderTest.php

@@ -11,16 +11,19 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Loader\AnnotationFileLoader;
 
 class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
 {
+    use ForwardCompatTestTrait;
+
     protected $loader;
     protected $reader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

Tests/Loader/DirectoryLoaderTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Routing\Tests\Loader;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderResolver;
 use Symfony\Component\Routing\Loader\AnnotationFileLoader;
@@ -20,10 +21,12 @@
 
 class DirectoryLoaderTest extends AbstractAnnotationLoaderTest
 {
+    use ForwardCompatTestTrait;
+
     private $loader;
     private $reader;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

Tests/Matcher/Dumper/PhpMatcherDumperTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Routing\Tests\Matcher\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
 use Symfony\Component\Routing\Matcher\RedirectableUrlMatcherInterface;
 use Symfony\Component\Routing\Matcher\UrlMatcher;
@@ -24,6 +25,8 @@
  */
 class PhpMatcherDumperTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     /**
      * @var string
      */
@@ -34,15 +37,15 @@ class PhpMatcherDumperTest extends TestCase
      */
     private $dumpPath;
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
         $this->matcherClass = uniqid('ProjectUrlMatcher');
         $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.$this->matcherClass.'.php';
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         parent::tearDown();
 

Tests/RouterTest.php

@@ -12,17 +12,20 @@
 namespace Symfony\Component\Routing\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Router;
 
 class RouterTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $router = null;
 
     private $loader = null;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
         $this->router = new Router($this->loader, 'routing.yml');