EntityFilterType introduce "choice_label" option

Kreyu · Apr 3, 2023 · aa4159c · aa4159c
1 parent db9def4
commit aa4159c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Bridge/Doctrine/Orm/Filter/Type/EntityFilterType.php b/src/Bridge/Doctrine/Orm/Filter/Type/EntityFilterType.php
@@ -40,7 +40,10 @@ public function apply(ProxyQueryInterface $query, FilterData $data, FilterInterf
 
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefault('field_type', EntityFormType::class);
+        $resolver->setDefaults([
+            'field_type' => EntityFormType::class,
+            'choice_label' => null,
+        ]);
 
         $resolver->setDefault('operator_options', function (OptionsResolver $resolver) {
             $resolver->setDefaults([
@@ -55,12 +58,10 @@ public function configureOptions(OptionsResolver $resolver): void
         });
 
         $resolver->setDefault('active_filter_formatter', function (FilterData $data, FilterInterface $filter, array $options): mixed {
-            $propertyAccessor = PropertyAccess::createPropertyAccessor();
-
-            $choiceLabel = $options['field_options']['choice_label'];
+            $choiceLabel = $options['choice_label'];
 
             if (is_string($choiceLabel)) {
-                return $propertyAccessor->getValue($data->getValue(), $choiceLabel);
+                return (PropertyAccess::createPropertyAccessor())->getValue($data->getValue(), $choiceLabel);
             }
 
             if (is_callable($choiceLabel)) {