[Autocomplete] Fix choice_value bug

symfony · Dec 11, 2023 · b5292d2 · b5292d2
1 parent a3de399
commit b5292d2
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Autocomplete/src/Form/WrappedEntityTypeAutocompleter.php b/src/Autocomplete/src/Form/WrappedEntityTypeAutocompleter.php
@@ -99,7 +99,17 @@ public function getLabel(object $entity): string
 
     public function getValue(object $entity): string
     {
-        return $this->getEntityMetadata()->getIdValue($entity);
+        $choiceValue = $this->getFormOption('choice_value');
+
+        if (\is_string($choiceValue) || $choiceValue instanceof PropertyPathInterface) {
+            return $this->propertyAccessor->getValue($entity, $choiceValue);
+        }
+
+        if ($choiceValue instanceof Cache\ChoiceValue) {
+            $choiceValue = $choiceValue->getOption();
+        }
+
+        return $choiceValue($entity);
     }
 
     public function isGranted(Security $security): bool