[Serializer] Refactor tests to not extends ObjectNormalize

lyrixx · lyrixx · commit cbae546cf5d2 · 2023-06-27T14:16:21.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -66,5 +66,5 @@ public function supportsNormalization(mixed $data, string $format = null /* , ar
      *
      * @return array<class-string|'*'|'object'|string, bool|null>
      */
-    /* public function getSupportedTypes(?string $format): array; */
+    public function getSupportedTypes(?string $format): array;
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -934,7 +934,7 @@ private function createXmlEncoderWithDateTimeNormalizer(): XmlEncoder
 
     private function createMockDateTimeNormalizer(): MockObject&NormalizerInterface
     {
-        $mock = $this->createMock(CustomNormalizer::class);
+        $mock = $this->createMock(NormalizerInterface::class);
 
         $mock
             ->expects($this->once())
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php b/src/Symfony/Component/Serializer/Tests/Fixtures/FormatAndContextAwareNormalizer.php
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -37,7 +37,6 @@
 use Symfony\Component\Serializer\Tests\Fixtures\Annotations\GroupDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\CircularReferenceDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyPrivatePropertyWithoutGetter;
-use Symfony\Component\Serializer\Tests\Fixtures\FormatAndContextAwareNormalizer;
 use Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74DummyPrivate;
@@ -731,20 +730,6 @@ public function testDoesntHaveIssuesWithUnionConstTypes()
         })::class)->foo);
     }
 
-    /**
-     * @group legacy
-     */
-    public function testExtractAttributesRespectsFormat()
-    {
-        $normalizer = new FormatAndContextAwareNormalizer();
-
-        $data = new ObjectDummy();
-        $data->setFoo('bar');
-        $data->bar = 'foo';
-
-        $this->assertSame(['foo' => 'bar', 'bar' => 'foo'], $normalizer->normalize($data, 'foo_and_bar_included'));
-    }
-
     public function testExtractAttributesRespectsContext()
     {
         $normalizer = new ObjectNormalizer();
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -89,7 +89,7 @@ public function testItThrowsExceptionOnInvalidEncoder()
     public function testNormalizeNoMatch()
     {
         $this->expectException(UnexpectedValueException::class);
-        $serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);
+        $serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);
         $serializer->normalize(new \stdClass(), 'xml');
     }
 
@@ -117,7 +117,7 @@ public function testNormalizeOnDenormalizer()
     public function testDenormalizeNoMatch()
     {
         $this->expectException(UnexpectedValueException::class);
-        $serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);
+        $serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);
         $serializer->denormalize('foo', 'stdClass');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,5 @@ public function supportsNormalization(mixed $data, string $format = null /* , ar`
`66`	`66`	`*`
`67`	`67`	`* @return array<class-string\|'*'\|'object'\|string, bool\|null>`
`68`	`68`	`*/`
`69`		`- /* public function getSupportedTypes(?string $format): array; */`
	`69`	`+ public function getSupportedTypes(?string $format): array;`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -934,7 +934,7 @@ private function createXmlEncoderWithDateTimeNormalizer(): XmlEncoder`
`934`	`934`
`935`	`935`	`private function createMockDateTimeNormalizer(): MockObject&NormalizerInterface`
`936`	`936`	`{`
`937`		`- $mock = $this->createMock(CustomNormalizer::class);`
	`937`	`+ $mock = $this->createMock(NormalizerInterface::class);`
`938`	`938`
`939`	`939`	`$mock`
`940`	`940`	`->expects($this->once())`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function testItThrowsExceptionOnInvalidEncoder()`
`89`	`89`	`public function testNormalizeNoMatch()`
`90`	`90`	`{`
`91`	`91`	`$this->expectException(UnexpectedValueException::class);`
`92`		`- $serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);`
	`92`	`+ $serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);`
`93`	`93`	`$serializer->normalize(new \stdClass(), 'xml');`
`94`	`94`	`}`
`95`	`95`
`@@ -117,7 +117,7 @@ public function testNormalizeOnDenormalizer()`
`117`	`117`	`public function testDenormalizeNoMatch()`
`118`	`118`	`{`
`119`	`119`	`$this->expectException(UnexpectedValueException::class);`
`120`		`- $serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);`
	`120`	`+ $serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);`
`121`	`121`	`$serializer->denormalize('foo', 'stdClass');`
`122`	`122`	`}`
`123`	`123`