[Serializer] Fix merge

symfony · Mar 19, 2024 · 8b83945 · 8b83945
1 parent 7058c7a
commit 8b83945
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 26 deletions.
diff --git a/Tests/Fixtures/SamePropertyAsMethodWithMethodSerializedNameDummy.php b/Tests/Fixtures/SamePropertyAsMethodWithMethodSerializedNameDummy.php
@@ -28,33 +28,25 @@ public function __construct($freeTrial, $hasSubscribe, $getReady, $isActive)
         $this->isActive = $isActive;
     }
 
-    /**
-     * @SerializedName("free_trial_method")
-     */
+    #[SerializedName('free_trial_method')]
     public function getFreeTrial()
     {
         return $this->freeTrial;
     }
 
-    /**
-     * @SerializedName("has_subscribe_method")
-     */
+    #[SerializedName('has_subscribe_method')]
     public function hasSubscribe()
     {
         return $this->hasSubscribe;
     }
 
-    /**
-     * @SerializedName("get_ready_method")
-     */
+    #[SerializedName('get_ready_method')]
     public function getReady()
     {
         return $this->getReady;
     }
 
-    /**
-     * @SerializedName("is_active_method")
-     */
+    #[SerializedName('is_active_method')]
     public function isActive()
     {
         return $this->isActive;

diff --git a/Tests/Fixtures/SamePropertyAsMethodWithPropertySerializedNameDummy.php b/Tests/Fixtures/SamePropertyAsMethodWithPropertySerializedNameDummy.php
@@ -15,24 +15,16 @@
 
 class SamePropertyAsMethodWithPropertySerializedNameDummy
 {
-    /**
-     * @SerializedName("free_trial_property")
-     */
+    #[SerializedName('free_trial_property')]
     private $freeTrial;
 
-    /**
-     * @SerializedName("has_subscribe_property")
-     */
+    #[SerializedName('has_subscribe_property')]
     private $hasSubscribe;
 
-    /**
-     * @SerializedName("get_ready_property")
-     */
+    #[SerializedName('get_ready_property')]
     private $getReady;
 
-    /**
-     * @SerializedName("is_active_property")
-     */
+    #[SerializedName('is_active_property')]
     private $isActive;
 
     public function __construct($freeTrial, $hasSubscribe, $getReady, $isActive)

diff --git a/Tests/Normalizer/ObjectNormalizerTest.php b/Tests/Normalizer/ObjectNormalizerTest.php
@@ -869,7 +869,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);
 
@@ -886,7 +886,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);