minor #52728 [Serializer] fix tests (xabbuh)

fabpot · fabpot · commit 2c7d612e7185 · 2023-11-25T09:37:16.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [Serializer] fix tests | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 67969da fix tests
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -837,12 +837,12 @@ public function testDenormalizeWithCorrectOrderOfAttributeAndProperty()
         $this->assertSame('nested-id', $test->id);
     }
 
-    public function testNormalizeWithIgnoreAnnotationAndPrivateProperties()
+    public function testNormalizeWithIgnoreAttributeAndPrivateProperties()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $serializer = new Serializer([new ObjectNormalizer($classMetadataFactory)]);
 
-        $this->assertSame(['foo' => 'foo'], $serializer->normalize(new ObjectDummyWithIgnoreAnnotationAndPrivateProperty()));
+        $this->assertSame(['foo' => 'foo'], $serializer->normalize(new ObjectDummyWithIgnoreAttributeAndPrivateProperty()));
     }
 
     public function testDenormalizeUntypedFormat()
@@ -1054,11 +1054,11 @@ class ObjectDummyWithContextAttributeSkipNullValues
     public ?string $propertyWithNullSkipNullValues = null;
 }
 
-class ObjectDummyWithIgnoreAnnotationAndPrivateProperty
+class ObjectDummyWithIgnoreAttributeAndPrivateProperty
 {
     public $foo = 'foo';
 
-    /** @Ignore */
+    #[Ignore]
     public $ignored = 'ignored';
 
     private $private = 'private';
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
 use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
@@ -494,7 +494,7 @@ protected function getNormalizerForSkipUninitializedValues(): NormalizerInterfac
 
     public function testNormalizeWithDiscriminator()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
         $normalizer = new GetSetMethodNormalizer($classMetadataFactory, null, null, $discriminator);
 
@@ -503,7 +503,7 @@ public function testNormalizeWithDiscriminator()
 
     public function testDenormalizeWithDiscriminator()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
         $normalizer = new GetSetMethodNormalizer($classMetadataFactory, null, null, $discriminator);
 
@@ -777,12 +777,10 @@ public function __call($key, $value)
     }
 }
 
-/**
- * @DiscriminatorMap(typeProperty="type", mapping={
- *     "one" = GetSetMethodDiscriminatedDummyOne::class,
- *     "two" = GetSetMethodDiscriminatedDummyTwo::class,
- * })
- */
+#[DiscriminatorMap(typeProperty: 'type', mapping: [
+    'one' => GetSetMethodDiscriminatedDummyOne::class,
+    'two' => GetSetMethodDiscriminatedDummyTwo::class,
+])]
 interface GetSetMethodDummyInterface
 {
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
 use Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor;
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
+use Symfony\Component\Serializer\Attribute\DiscriminatorMap;
 use Symfony\Component\Serializer\Exception\LogicException;
 use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
@@ -499,7 +499,7 @@ protected function getNormalizerForSkipUninitializedValues(): NormalizerInterfac
 
     public function testNormalizeWithDiscriminator()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
         $normalizer = new PropertyNormalizer($classMetadataFactory, null, null, $discriminator);
 
@@ -508,7 +508,7 @@ public function testNormalizeWithDiscriminator()
 
     public function testDenormalizeWithDiscriminator()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
         $normalizer = new PropertyNormalizer($classMetadataFactory, null, null, $discriminator);
 
@@ -621,12 +621,10 @@ public function getIntMatrix(): array
     }
 }
 
-/**
- * @DiscriminatorMap(typeProperty="type", mapping={
- *     "one" = PropertyDiscriminatedDummyOne::class,
- *     "two" = PropertyDiscriminatedDummyTwo::class,
- * })
- */
+#[DiscriminatorMap(typeProperty: 'type', mapping: [
+    'one' => PropertyDiscriminatedDummyOne::class,
+    'two' => PropertyDiscriminatedDummyTwo::class,
+])]
 interface PropertyDummyInterface
 {
 }

Original file line number	Diff line number	Diff line change
`@@ -837,12 +837,12 @@ public function testDenormalizeWithCorrectOrderOfAttributeAndProperty()`
`837`	`837`	`$this->assertSame('nested-id', $test->id);`
`838`	`838`	`}`
`839`	`839`
`840`		`- public function testNormalizeWithIgnoreAnnotationAndPrivateProperties()`
	`840`	`+ public function testNormalizeWithIgnoreAttributeAndPrivateProperties()`
`841`	`841`	`{`
`842`		`- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));`
	`842`	`+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());`
`843`	`843`	`$serializer = new Serializer([new ObjectNormalizer($classMetadataFactory)]);`
`844`	`844`
`845`		`- $this->assertSame(['foo' => 'foo'], $serializer->normalize(new ObjectDummyWithIgnoreAnnotationAndPrivateProperty()));`
	`845`	`+ $this->assertSame(['foo' => 'foo'], $serializer->normalize(new ObjectDummyWithIgnoreAttributeAndPrivateProperty()));`
`846`	`846`	`}`
`847`	`847`
`848`	`848`	`public function testDenormalizeUntypedFormat()`
`@@ -1054,11 +1054,11 @@ class ObjectDummyWithContextAttributeSkipNullValues`
`1054`	`1054`	`public ?string $propertyWithNullSkipNullValues = null;`
`1055`	`1055`	`}`
`1056`	`1056`
`1057`		`-class ObjectDummyWithIgnoreAnnotationAndPrivateProperty`
	`1057`	`+class ObjectDummyWithIgnoreAttributeAndPrivateProperty`
`1058`	`1058`	`{`
`1059`	`1059`	`public $foo = 'foo';`
`1060`	`1060`
`1061`		`- /** @Ignore */`
	`1061`	`+ #[Ignore]`
`1062`	`1062`	`public $ignored = 'ignored';`
`1063`	`1063`
`1064`	`1064`	`private $private = 'private';`