minor symfony#32889 [PhpUnitBridge] Remove use of ForwardCompatTrait …

…(jderusse) This PR was merged into the 3.4 branch. Discussion ---------- [PhpUnitBridge] Remove use of ForwardCompatTrait | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#32844 | License | MIT | Doc PR | NA With symfony#32882 the ForwardCompatibilityTrait is injected in TestCase which now act as a true polyfill Commits ------- ac6242f Remove use of ForwardCompatTrait
hultberg · Aug 3, 2019 · 6fb0ee3 · 6fb0ee3
2 parents b5c5e29 + 165430f
commit 6fb0ee3
Show file tree

Hide file tree

Showing 26 changed files with 20 additions and 98 deletions.
diff --git a/Tests/Annotation/GroupsTest.php b/Tests/Annotation/GroupsTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\Serializer\Tests\Annotation;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 class GroupsTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testEmptyGroupsParameter()
     {
         $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');

diff --git a/Tests/Annotation/MaxDepthTest.php b/Tests/Annotation/MaxDepthTest.php
@@ -12,16 +12,13 @@
 namespace Symfony\Component\Serializer\Tests\Annotation;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Annotation\MaxDepth;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 class MaxDepthTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testNotSetMaxDepthParameter()
     {
         $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');

diff --git a/Tests/DependencyInjection/SerializerPassTest.php b/Tests/DependencyInjection/SerializerPassTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Serializer\Tests\DependencyInjection;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
@@ -24,8 +23,6 @@
  */
 class SerializerPassTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testThrowExceptionWhenNoNormalizers()
     {
         $this->expectException('RuntimeException');

diff --git a/Tests/Encoder/ChainDecoderTest.php b/Tests/Encoder/ChainDecoderTest.php
@@ -12,13 +12,10 @@
 namespace Symfony\Component\Serializer\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Encoder\ChainDecoder;
 
 class ChainDecoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const FORMAT_1 = 'format1';
     const FORMAT_2 = 'format2';
     const FORMAT_3 = 'format3';
@@ -27,7 +24,7 @@ class ChainDecoderTest extends TestCase
     private $decoder1;
     private $decoder2;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->decoder1 = $this
             ->getMockBuilder('Symfony\Component\Serializer\Encoder\DecoderInterface')

diff --git a/Tests/Encoder/ChainEncoderTest.php b/Tests/Encoder/ChainEncoderTest.php
@@ -12,15 +12,12 @@
 namespace Symfony\Component\Serializer\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Encoder\ChainEncoder;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Encoder\NormalizationAwareInterface;
 
 class ChainEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     const FORMAT_1 = 'format1';
     const FORMAT_2 = 'format2';
     const FORMAT_3 = 'format3';
@@ -29,7 +26,7 @@ class ChainEncoderTest extends TestCase
     private $encoder1;
     private $encoder2;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->encoder1 = $this
             ->getMockBuilder('Symfony\Component\Serializer\Encoder\EncoderInterface')

diff --git a/Tests/Encoder/CsvEncoderTest.php b/Tests/Encoder/CsvEncoderTest.php
@@ -12,22 +12,19 @@
 namespace Symfony\Component\Serializer\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Encoder\CsvEncoder;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 class CsvEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var CsvEncoder
      */
     private $encoder;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->encoder = new CsvEncoder();
     }

diff --git a/Tests/Encoder/JsonDecodeTest.php b/Tests/Encoder/JsonDecodeTest.php
@@ -12,18 +12,15 @@
 namespace Symfony\Component\Serializer\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Encoder\JsonDecode;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 
 class JsonDecodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /** @var \Symfony\Component\Serializer\Encoder\JsonDecode */
     private $decode;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->decode = new JsonDecode();
     }

diff --git a/Tests/Encoder/JsonEncodeTest.php b/Tests/Encoder/JsonEncodeTest.php
@@ -12,17 +12,14 @@
 namespace Symfony\Component\Serializer\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Encoder\JsonEncode;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 
 class JsonEncodeTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $encoder;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->encode = new JsonEncode();
     }

diff --git a/Tests/Encoder/JsonEncoderTest.php b/Tests/Encoder/JsonEncoderTest.php
@@ -12,19 +12,16 @@
 namespace Symfony\Component\Serializer\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
 use Symfony\Component\Serializer\Serializer;
 
 class JsonEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     private $encoder;
     private $serializer;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->encoder = new JsonEncoder();
         $this->serializer = new Serializer([new CustomNormalizer()], ['json' => new JsonEncoder()]);

diff --git a/Tests/Encoder/XmlEncoderTest.php b/Tests/Encoder/XmlEncoderTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Serializer\Tests\Encoder;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;
 use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -23,16 +22,14 @@
 
 class XmlEncoderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var XmlEncoder
      */
     private $encoder;
 
     private $exampleDateTimeString = '2017-02-19T15:16:08+0300';
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->encoder = new XmlEncoder();
         $serializer = new Serializer([new CustomNormalizer()], ['xml' => new XmlEncoder()]);

diff --git a/Tests/Mapping/Factory/CacheMetadataFactoryTest.php b/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Serializer\Tests\Mapping\Factory;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
@@ -24,8 +23,6 @@
  */
 class CacheMetadataFactoryTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testGetMetadataFor()
     {
         $metadata = new ClassMetadata(Dummy::class);

diff --git a/Tests/Mapping/Loader/AnnotationLoaderTest.php b/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
@@ -23,14 +22,12 @@
  */
 class AnnotationLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var AnnotationLoader
      */
     private $loader;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->loader = new AnnotationLoader(new AnnotationReader());
     }

diff --git a/Tests/Mapping/Loader/XmlFileLoaderTest.php b/Tests/Mapping/Loader/XmlFileLoaderTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Serializer\Tests\Mapping\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
 use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
@@ -22,8 +21,6 @@
  */
 class XmlFileLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var XmlFileLoader
      */
@@ -33,7 +30,7 @@ class XmlFileLoaderTest extends TestCase
      */
     private $metadata;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->loader = new XmlFileLoader(__DIR__.'/../../Fixtures/serialization.xml');
         $this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');

diff --git a/Tests/Mapping/Loader/YamlFileLoaderTest.php b/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Serializer\Tests\Mapping\Loader;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Loader\YamlFileLoader;
 use Symfony\Component\Serializer\Tests\Mapping\TestClassMetadataFactory;
@@ -22,8 +21,6 @@
  */
 class YamlFileLoaderTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var YamlFileLoader
      */
@@ -33,7 +30,7 @@ class YamlFileLoaderTest extends TestCase
      */
     private $metadata;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->loader = new YamlFileLoader(__DIR__.'/../../Fixtures/serialization.yml');
         $this->metadata = new ClassMetadata('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');

diff --git a/Tests/Normalizer/AbstractNormalizerTest.php b/Tests/Normalizer/AbstractNormalizerTest.php
@@ -3,7 +3,6 @@
 namespace Symfony\Component\Serializer\Tests\Normalizer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Mapping\AttributeMetadata;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
@@ -26,8 +25,6 @@
  */
 class AbstractNormalizerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var AbstractNormalizerDummy
      */
@@ -38,7 +35,7 @@ class AbstractNormalizerTest extends TestCase
      */
     private $classMetadata;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $loader = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Loader\LoaderChain')->setConstructorArgs([[]])->getMock();
         $this->classMetadata = $this->getMockBuilder('Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory')->setConstructorArgs([$loader])->getMock();

diff --git a/Tests/Normalizer/AbstractObjectNormalizerTest.php b/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
@@ -27,8 +26,6 @@
 
 class AbstractObjectNormalizerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     public function testDenormalize()
     {
         $normalizer = new AbstractObjectNormalizerDummy();

diff --git a/Tests/Normalizer/ArrayDenormalizerTest.php b/Tests/Normalizer/ArrayDenormalizerTest.php
@@ -12,14 +12,11 @@
 namespace Symfony\Component\Serializer\Tests\Normalizer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
 
 class ArrayDenormalizerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var ArrayDenormalizer
      */
@@ -30,7 +27,7 @@ class ArrayDenormalizerTest extends TestCase
      */
     private $serializer;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')->getMock();
         $this->denormalizer = new ArrayDenormalizer();

diff --git a/Tests/Normalizer/CustomNormalizerTest.php b/Tests/Normalizer/CustomNormalizerTest.php
@@ -12,21 +12,18 @@
 namespace Symfony\Component\Serializer\Tests\Normalizer;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\Tests\Fixtures\ScalarDummy;
 
 class CustomNormalizerTest extends TestCase
 {
-    use ForwardCompatTestTrait;
-
     /**
      * @var CustomNormalizer
      */
     private $normalizer;
 
-    private function doSetUp()
+    protected function setUp()
     {
         $this->normalizer = new CustomNormalizer();
         $this->normalizer->setSerializer(new Serializer());