Make tests support phpunit 8

Author: nicolas-grekas

Test/ConstraintValidatorTestCase.php

@@ -29,7 +29,7 @@
  */
 abstract class ConstraintValidatorTestCase extends TestCase
 {
-    use TestCaseSetUpTearDownTrait;
+    use ForwardCompatTestTrait;
 
     /**
      * @var ExecutionContextInterface

Test/TestCaseSetUpTearDownTrait.php renamed to Test/ForwardCompatTestTrait.php

@@ -22,7 +22,7 @@
     /**
      * @internal
      */
-    trait TestCaseSetUpTearDownTrait
+    trait ForwardCompatTestTrait
     {
         private function doSetUp(): void
         {
@@ -47,7 +47,7 @@ protected function tearDown(): void
     /**
      * @internal
      */
-    trait TestCaseSetUpTearDownTrait
+    trait ForwardCompatTestTrait
     {
         /**
          * @return void

Tests/ConstraintViolationListTest.php

@@ -12,19 +12,22 @@
 namespace Symfony\Component\Validator\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 
 class ConstraintViolationListTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     protected $list;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->list = new ConstraintViolationList();
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->list = null;
     }

Tests/Constraints/FileValidatorTest.php

@@ -11,13 +11,16 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\Validator\Constraints\File;
 use Symfony\Component\Validator\Constraints\FileValidator;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 abstract class FileValidatorTest extends ConstraintValidatorTestCase
 {
+    use ForwardCompatTestTrait;
+
     protected $path;
 
     protected $file;
@@ -27,7 +30,7 @@ protected function createValidator()
         return new FileValidator();
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 
@@ -36,7 +39,7 @@ protected function setUp()
         fwrite($this->file, ' ', 1);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         parent::tearDown();
 

Tests/Constraints/ImageValidatorTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Constraints\Image;
 use Symfony\Component\Validator\Constraints\ImageValidator;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -20,6 +21,8 @@
  */
 class ImageValidatorTest extends ConstraintValidatorTestCase
 {
+    use ForwardCompatTestTrait;
+
     protected $context;
 
     /**
@@ -39,7 +42,7 @@ protected function createValidator()
         return new ImageValidator();
     }
 
-    protected function setUp()
+    private function doSetUp()
     {
         parent::setUp();
 

Tests/Constraints/TypeValidatorTest.php

@@ -11,12 +11,15 @@
 
 namespace Symfony\Component\Validator\Tests\Constraints;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Constraints\Type;
 use Symfony\Component\Validator\Constraints\TypeValidator;
 use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
 
 class TypeValidatorTest extends ConstraintValidatorTestCase
 {
+    use ForwardCompatTestTrait;
+
     protected static $file;
 
     protected function createValidator()
@@ -172,7 +175,7 @@ protected function createFile()
         return static::$file;
     }
 
-    public static function tearDownAfterClass()
+    private static function doTearDownAfterClass()
     {
         if (static::$file) {
             fclose(static::$file);

Tests/Mapping/Cache/DoctrineCacheTest.php

@@ -12,11 +12,14 @@
 namespace Symfony\Component\Validator\Tests\Mapping\Cache;
 
 use Doctrine\Common\Cache\ArrayCache;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Mapping\Cache\DoctrineCache;
 
 class DoctrineCacheTest extends AbstractCacheTest
 {
-    protected function setUp()
+    use ForwardCompatTestTrait;
+
+    private function doSetUp()
     {
         $this->cache = new DoctrineCache(new ArrayCache());
     }

Tests/Mapping/Cache/Psr6CacheTest.php

@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\Validator\Tests\Mapping\Cache;
 
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Validator\Mapping\Cache\Psr6Cache;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
@@ -11,7 +12,9 @@
  */
 class Psr6CacheTest extends AbstractCacheTest
 {
-    protected function setUp()
+    use ForwardCompatTestTrait;
+
+    private function doSetUp()
     {
         $this->cache = new Psr6Cache(new ArrayAdapter());
     }

Tests/Mapping/ClassMetadataTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests\Mapping;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
@@ -21,19 +22,21 @@
 
 class ClassMetadataTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     const CLASSNAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
     const PARENTCLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
     const PROVIDERCLASS = 'Symfony\Component\Validator\Tests\Fixtures\GroupSequenceProviderEntity';
     const PROVIDERCHILDCLASS = 'Symfony\Component\Validator\Tests\Fixtures\GroupSequenceProviderChildEntity';
 
     protected $metadata;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->metadata = new ClassMetadata(self::CLASSNAME);
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         $this->metadata = null;
     }

Tests/Mapping/Loader/StaticMethodLoaderTest.php

@@ -12,20 +12,23 @@
 namespace Symfony\Component\Validator\Tests\Mapping\Loader;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 
 class StaticMethodLoaderTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     private $errorLevel;
 
-    protected function setUp()
+    private function doSetUp()
     {
         $this->errorLevel = error_reporting();
     }
 
-    protected function tearDown()
+    private function doTearDown()
     {
         error_reporting($this->errorLevel);
     }