From 783acef5b6961af5d3ff465bd137077bf0444c88 Mon Sep 17 00:00:00 2001
From: Conrad Barthelmes <con@conbookm2.fritz.box>
Date: Fri, 19 Jan 2024 19:07:37 +0100
Subject: [PATCH 1/2] #48167 add fallbackCallbackAccessor to
 PropertyPathAccessor to support custom getter methods when submitting a form

---
 .../DataAccessor/PropertyPathAccessor.php     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
index e639bad2a49c2..a1a57b7b4d775 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
@@ -30,10 +30,12 @@
 class PropertyPathAccessor implements DataAccessorInterface
 {
     private $propertyAccessor;
+    private $fallbackCallbackAccessorForCustomGetter;
 
     public function __construct(?PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->propertyAccessor = $propertyAccessor ?? PropertyAccess::createPropertyAccessor();
+        $this->fallbackCallbackAccessorForCustomGetter = new CallbackAccessor();
     }
 
     /**
@@ -45,7 +47,7 @@ public function getValue($data, FormInterface $form)
             throw new AccessException('Unable to read from the given form data as no property path is defined.');
         }
 
-        return $this->getPropertyValue($data, $propertyPath);
+        return $this->getPropertyValue($data, $propertyPath, $form);
     }
 
     /**
@@ -59,13 +61,17 @@ public function setValue(&$data, $propertyValue, FormInterface $form): void
 
         // If the field is of type DateTimeInterface and the data is the same skip the update to
         // keep the original object hash
-        if ($propertyValue instanceof \DateTimeInterface && $propertyValue == $this->getPropertyValue($data, $propertyPath)) {
+        if ($propertyValue instanceof \DateTimeInterface && $propertyValue == $this->getPropertyValue($data, $propertyPath, $form)) {
             return;
         }
 
         // If the data is identical to the value in $data, we are
         // dealing with a reference
-        if (!\is_object($data) || !$form->getConfig()->getByReference() || $propertyValue !== $this->getPropertyValue($data, $propertyPath)) {
+        if (
+            \is_object($data) ||
+            !$form->getConfig()->getByReference() ||
+            $propertyValue !== $this->getPropertyValue($data, $propertyPath, $form)
+        ) {
             $this->propertyAccessor->setValue($data, $propertyPath, $propertyValue);
         }
     }
@@ -86,7 +92,7 @@ public function isWritable($data, FormInterface $form): bool
         return null !== $form->getPropertyPath();
     }
 
-    private function getPropertyValue($data, PropertyPathInterface $propertyPath)
+    private function getPropertyValue($data, PropertyPathInterface $propertyPath, FormInterface $form)
     {
         try {
             return $this->propertyAccessor->getValue($data, $propertyPath);
@@ -95,9 +101,16 @@ private function getPropertyValue($data, PropertyPathInterface $propertyPath)
                 return null;
             }
 
+            try {
+                return $this->fallbackCallbackAccessorForCustomGetter->getValue($data, $form);
+            } catch (AccessException $accessException) {
+                // todo what do we do with this exception? throw it? ignore it?
+            }
+
             if (!$e instanceof UninitializedPropertyException
                 // For versions without UninitializedPropertyException check the exception message
-                && (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(), 'You should initialize it'))
+                && (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(),
+                        'You should initialize it'))
             ) {
                 throw $e;
             }

From 213f01534a621b8a992a4fc470927ba26a8062e3 Mon Sep 17 00:00:00 2001
From: Conrad Barthelmes <con@conbookm2.fritz.box>
Date: Fri, 19 Jan 2024 20:18:11 +0100
Subject: [PATCH 2/2] #48167 revert formatting

---
 .../Form/Extension/Core/DataAccessor/PropertyPathAccessor.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
index a1a57b7b4d775..4b2bf891e821e 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php
@@ -109,8 +109,7 @@ private function getPropertyValue($data, PropertyPathInterface $propertyPath, Fo
 
             if (!$e instanceof UninitializedPropertyException
                 // For versions without UninitializedPropertyException check the exception message
-                && (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(),
-                        'You should initialize it'))
+                && (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(), 'You should initialize it'))
             ) {
                 throw $e;
             }