From 165430fff7e91875b08f216cc7e5cbc37bd24a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Fri, 2 Aug 2019 19:02:27 +0200 Subject: [PATCH] Remove use of ForwardCompatTrait --- Tests/Annotation/GroupsTest.php | 3 --- Tests/Annotation/MaxDepthTest.php | 3 --- Tests/DependencyInjection/SerializerPassTest.php | 3 --- Tests/Encoder/ChainDecoderTest.php | 5 +---- Tests/Encoder/ChainEncoderTest.php | 5 +---- Tests/Encoder/CsvEncoderTest.php | 5 +---- Tests/Encoder/JsonDecodeTest.php | 5 +---- Tests/Encoder/JsonEncodeTest.php | 5 +---- Tests/Encoder/JsonEncoderTest.php | 5 +---- Tests/Encoder/XmlEncoderTest.php | 5 +---- Tests/Mapping/Factory/CacheMetadataFactoryTest.php | 3 --- Tests/Mapping/Loader/AnnotationLoaderTest.php | 5 +---- Tests/Mapping/Loader/XmlFileLoaderTest.php | 5 +---- Tests/Mapping/Loader/YamlFileLoaderTest.php | 5 +---- Tests/Normalizer/AbstractNormalizerTest.php | 5 +---- Tests/Normalizer/AbstractObjectNormalizerTest.php | 3 --- Tests/Normalizer/ArrayDenormalizerTest.php | 5 +---- Tests/Normalizer/CustomNormalizerTest.php | 5 +---- Tests/Normalizer/DataUriNormalizerTest.php | 5 +---- Tests/Normalizer/DateIntervalNormalizerTest.php | 5 +---- Tests/Normalizer/DateTimeNormalizerTest.php | 5 +---- Tests/Normalizer/GetSetMethodNormalizerTest.php | 5 +---- Tests/Normalizer/JsonSerializableNormalizerTest.php | 5 +---- Tests/Normalizer/ObjectNormalizerTest.php | 5 +---- Tests/Normalizer/PropertyNormalizerTest.php | 5 +---- Tests/SerializerTest.php | 3 --- 26 files changed, 20 insertions(+), 98 deletions(-) diff --git a/Tests/Annotation/GroupsTest.php b/Tests/Annotation/GroupsTest.php index 203eb3c92b93b..3fad6d82f83c9 100644 --- a/Tests/Annotation/GroupsTest.php +++ b/Tests/Annotation/GroupsTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Serializer\Tests\Annotation; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Annotation\Groups; /** @@ -20,8 +19,6 @@ */ 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 index 8cca874ecd2a5..2c421576d14b3 100644 --- a/Tests/Annotation/MaxDepthTest.php +++ b/Tests/Annotation/MaxDepthTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Serializer\Tests\Annotation; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Annotation\MaxDepth; /** @@ -20,8 +19,6 @@ */ 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 index d5e044504f584..65d7a65f5acdb 100644 --- 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 index 659930c41e524..5bdbd282ef3a2 100644 --- 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 index bfec205a273d1..9f674e030842d 100644 --- 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 index d6969d6f5dde6..7b5131cb533a6 100644 --- a/Tests/Encoder/CsvEncoderTest.php +++ b/Tests/Encoder/CsvEncoderTest.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\CsvEncoder; /** @@ -20,14 +19,12 @@ */ 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 index f5d0dc5a3c963..649fb2ec0db2d 100644 --- 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 index 6c16e99c15b97..1a3d7c8675598 100644 --- 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 index 27e1a55b02e3c..191e8dc35d3ef 100644 --- 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 index 26ac844781079..a164d517da323 100644 --- 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,8 +22,6 @@ class XmlEncoderTest extends TestCase { - use ForwardCompatTestTrait; - /** * @var XmlEncoder */ @@ -32,7 +29,7 @@ class XmlEncoderTest extends TestCase 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 index 8c5d61e2617ee..723dc9b0494f2 100644 --- 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 index ee07e929ee998..b2e5c69211227 100644 --- 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 index b142ac08eceb6..264f37fc42d97 100644 --- 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 index 00674e2423ee9..9eb29f25094fe 100644 --- 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 index b0991c17d018c..cce383075a6fe 100644 --- 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 index d76ac4c165b2b..8ce2c10558a7e 100644 --- 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 index efe18b24f5368..132f3c0806350 100644 --- 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 index 3a20f800b0410..28fb73ece5bcd 100644 --- 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()); diff --git a/Tests/Normalizer/DataUriNormalizerTest.php b/Tests/Normalizer/DataUriNormalizerTest.php index 6f327657dabc1..290428980cf88 100644 --- a/Tests/Normalizer/DataUriNormalizerTest.php +++ b/Tests/Normalizer/DataUriNormalizerTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\Serializer\Normalizer\DataUriNormalizer; @@ -21,8 +20,6 @@ */ class DataUriNormalizerTest extends TestCase { - use ForwardCompatTestTrait; - const TEST_GIF_DATA = 'data:image/gif;base64,R0lGODdhAQABAIAAAP///////ywAAAAAAQABAAACAkQBADs='; const TEST_TXT_DATA = 'data:text/plain,K%C3%A9vin%20Dunglas%0A'; const TEST_TXT_CONTENT = "Kévin Dunglas\n"; @@ -32,7 +29,7 @@ class DataUriNormalizerTest extends TestCase */ private $normalizer; - private function doSetUp() + protected function setUp() { $this->normalizer = new DataUriNormalizer(); } diff --git a/Tests/Normalizer/DateIntervalNormalizerTest.php b/Tests/Normalizer/DateIntervalNormalizerTest.php index 2f4bee62c2149..efe34c6e9510e 100644 --- a/Tests/Normalizer/DateIntervalNormalizerTest.php +++ b/Tests/Normalizer/DateIntervalNormalizerTest.php @@ -3,7 +3,6 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Normalizer\DateIntervalNormalizer; /** @@ -11,14 +10,12 @@ */ class DateIntervalNormalizerTest extends TestCase { - use ForwardCompatTestTrait; - /** * @var DateIntervalNormalizer */ private $normalizer; - private function doSetUp() + protected function setUp() { $this->normalizer = new DateIntervalNormalizer(); } diff --git a/Tests/Normalizer/DateTimeNormalizerTest.php b/Tests/Normalizer/DateTimeNormalizerTest.php index 0234cf27cc040..14b043b64b5a2 100644 --- a/Tests/Normalizer/DateTimeNormalizerTest.php +++ b/Tests/Normalizer/DateTimeNormalizerTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer; /** @@ -20,14 +19,12 @@ */ class DateTimeNormalizerTest extends TestCase { - use ForwardCompatTestTrait; - /** * @var DateTimeNormalizer */ private $normalizer; - private function doSetUp() + protected function setUp() { $this->normalizer = new DateTimeNormalizer(); } diff --git a/Tests/Normalizer/GetSetMethodNormalizerTest.php b/Tests/Normalizer/GetSetMethodNormalizerTest.php index 3ce06b659f80c..13a244e72eb1c 100644 --- a/Tests/Normalizer/GetSetMethodNormalizerTest.php +++ b/Tests/Normalizer/GetSetMethodNormalizerTest.php @@ -13,7 +13,6 @@ use Doctrine\Common\Annotations\AnnotationReader; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory; use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader; use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter; @@ -28,8 +27,6 @@ class GetSetMethodNormalizerTest extends TestCase { - use ForwardCompatTestTrait; - /** * @var GetSetMethodNormalizer */ @@ -39,7 +36,7 @@ class GetSetMethodNormalizerTest extends TestCase */ private $serializer; - private function doSetUp() + protected function setUp() { $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\SerializerNormalizer')->getMock(); $this->normalizer = new GetSetMethodNormalizer(); diff --git a/Tests/Normalizer/JsonSerializableNormalizerTest.php b/Tests/Normalizer/JsonSerializableNormalizerTest.php index 0532ef47c093b..c08394a2779fd 100644 --- a/Tests/Normalizer/JsonSerializableNormalizerTest.php +++ b/Tests/Normalizer/JsonSerializableNormalizerTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; use Symfony\Component\Serializer\SerializerInterface; @@ -23,8 +22,6 @@ */ class JsonSerializableNormalizerTest extends TestCase { - use ForwardCompatTestTrait; - /** * @var JsonSerializableNormalizer */ @@ -35,7 +32,7 @@ class JsonSerializableNormalizerTest extends TestCase */ private $serializer; - private function doSetUp() + protected function setUp() { $this->serializer = $this->getMockBuilder(JsonSerializerNormalizer::class)->getMock(); $this->normalizer = new JsonSerializableNormalizer(); diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php index 2a27c1646ca00..765db4c82bbae 100644 --- a/Tests/Normalizer/ObjectNormalizerTest.php +++ b/Tests/Normalizer/ObjectNormalizerTest.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\Extractor\ReflectionExtractor; use Symfony\Component\PropertyInfo\PropertyInfoExtractor; @@ -36,8 +35,6 @@ */ class ObjectNormalizerTest extends TestCase { - use ForwardCompatTestTrait; - /** * @var ObjectNormalizer */ @@ -47,7 +44,7 @@ class ObjectNormalizerTest extends TestCase */ private $serializer; - private function doSetUp() + protected function setUp() { $this->serializer = $this->getMockBuilder(__NAMESPACE__.'\ObjectSerializerNormalizer')->getMock(); $this->normalizer = new ObjectNormalizer(); diff --git a/Tests/Normalizer/PropertyNormalizerTest.php b/Tests/Normalizer/PropertyNormalizerTest.php index 3ed994caaf7fc..4b138fca7ba98 100644 --- a/Tests/Normalizer/PropertyNormalizerTest.php +++ b/Tests/Normalizer/PropertyNormalizerTest.php @@ -13,7 +13,6 @@ use Doctrine\Common\Annotations\AnnotationReader; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory; use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader; use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter; @@ -28,8 +27,6 @@ class PropertyNormalizerTest extends TestCase { - use ForwardCompatTestTrait; - /** * @var PropertyNormalizer */ @@ -39,7 +36,7 @@ class PropertyNormalizerTest extends TestCase */ private $serializer; - private function doSetUp() + protected function setUp() { $this->serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock(); $this->normalizer = new PropertyNormalizer(); diff --git a/Tests/SerializerTest.php b/Tests/SerializerTest.php index 03708ab048702..c4814e364f53e 100644 --- a/Tests/SerializerTest.php +++ b/Tests/SerializerTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Serializer\Tests; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait; use Symfony\Component\Serializer\Encoder\JsonEncoder; use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer; use Symfony\Component\Serializer\Normalizer\CustomNormalizer; @@ -31,8 +30,6 @@ class SerializerTest extends TestCase { - use ForwardCompatTestTrait; - public function testInterface() { $serializer = new Serializer();