From 43419f9f15d12f936baf5241dd2c89c4ed28ddd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 10 Jul 2023 15:39:00 +0200
Subject: [PATCH] [filterOrder] fix error in method getActiveFilters when
 dealing with entityChoice with incorrect number of translation

---
 .../Templating/Listing/FilterOrderHelper.php        | 13 ++++++++-----
 .../Templating/Listing/FilterOrderPositionEnum.php  |  9 +++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
index a038dfd71..701238208 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
@@ -84,9 +84,11 @@ final class FilterOrderHelper
 
     public function addCheckbox(string $name, array $choices, ?array $default = [], ?array $trans = [], array $options = []): self
     {
-        $missing = count($choices) - count($trans) - 1;
+        $missing = count($choices) - count($trans);
+
         $this->checkboxes[$name] = [
-            'choices' => $choices, 'default' => $default,
+            'choices' => $choices,
+            'default' => $default,
             'trans' => array_merge(
                 $trans,
                 0 < $missing ?
@@ -223,9 +225,10 @@ final class FilterOrderHelper
             }
         }
 
-        foreach ($this->checkboxes as $name => ['choices' => $choices, 'trans' => $trans, 'options' => $options]) {
+        foreach ($this->checkboxes as $name => ['choices' => $choices, 'trans' => $trans]) {
+            $translatedChoice = array_combine($choices, [...$trans]);
             foreach ($this->getCheckboxData($name) as $keyChoice) {
-                $result[] = ['value' => $choices['keyChoice'], 'label' => $options['label'], 'position' => FilterOrderPositionEnum::Checkboxes->value, 'name' => $name];
+                $result[] = ['value' => $translatedChoice[$keyChoice], 'label' => '', 'position' => FilterOrderPositionEnum::Checkboxes->value, 'name' => $name];
             }
         }
 
@@ -237,7 +240,7 @@ final class FilterOrderHelper
                     $value = $this->propertyAccessor->getValue($selected, $options['choice_label']);
                 } else {
                     if (!$selected instanceof \Stringable) {
-                        throw new \UnexpectedValueException(sprintf("we are not able to transform the value of %s to a string. Implements \Stringable or add a 'choice_label' option to the filterFormBuilder", get_class($selected)));
+                        throw new \UnexpectedValueException(sprintf("we are not able to transform the value of %s to a string. Implements \\Stringable or add a 'choice_label' option to the filterFormBuilder", get_class($selected)));
                     }
 
                     $value = (string) $selected;
diff --git a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php
index cda8119f5..09e8d39aa 100644
--- a/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php
+++ b/src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderPositionEnum.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\MainBundle\Templating\Listing;
 
 enum FilterOrderPositionEnum: string