fix merge

xabbuh · xabbuh · commit e8fbd7d9883e · 2024-03-19T10:40:14.000+01:00
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -854,7 +854,7 @@ public function testSamePropertyAsMethod()
 
     public function testSamePropertyAsMethodWithPropertySerializedName()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
         $this->normalizer->setSerializer($this->serializer);
 
@@ -871,7 +871,7 @@ public function testSamePropertyAsMethodWithPropertySerializedName()
 
     public function testSamePropertyAsMethodWithMethodSerializedName()
     {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
         $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
         $this->normalizer->setSerializer($this->serializer);
 

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,7 @@ public function testSamePropertyAsMethod()`
`854`	`854`
`855`	`855`	`public function testSamePropertyAsMethodWithPropertySerializedName()`
`856`	`856`	`{`
`857`		`- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));`
	`857`	`+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());`
`858`	`858`	`$this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));`
`859`	`859`	`$this->normalizer->setSerializer($this->serializer);`
`860`	`860`
`@@ -871,7 +871,7 @@ public function testSamePropertyAsMethodWithPropertySerializedName()`
`871`	`871`
`872`	`872`	`public function testSamePropertyAsMethodWithMethodSerializedName()`
`873`	`873`	`{`
`874`		`- $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));`
	`874`	`+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());`
`875`	`875`	`$this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));`
`876`	`876`	`$this->normalizer->setSerializer($this->serializer);`
`877`	`877`