Merge branch '6.4' into 7.0

* 6.4:
  [Serializer] Fix merge
  [VarExporter] add `#[Ignore]` to proxy-related methods to prevent them from being serialized

Author: derrabus

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;

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)