Merge pull request #283 from BitBagCommerce/bugfix/cast_facet_code_to_string

Cast facetId to string to avoid errors with numeric option codes

Author: senghe

src/Api/Resolver/FacetsResolver.php

@@ -39,15 +39,15 @@ public function resolve(array $data): array
         $query->setSize(0);
 
         foreach ($this->facetRegistry->getFacets() as $facetId => $facet) {
-            $query->addAggregation($facet->getAggregation()->setName($facetId));
+            $query->addAggregation($facet->getAggregation()->setName((string) $facetId));
         }
 
         foreach ($data['facets'] ?? [] as $facetId => $selectedBuckets) {
             if (!$selectedBuckets) {
                 continue;
             }
 
-            $facet = $this->facetRegistry->getFacetById($facetId);
+            $facet = $this->facetRegistry->getFacetById((string) $facetId);
             $boolQuery->addFilter($facet->getQuery($selectedBuckets));
         }
 

src/Facet/AutoDiscoverRegistry.php

@@ -47,7 +47,7 @@ public function autoRegister(): void
         $this->discoverOptions();
 
         foreach ($this->facets as $facetId => $facet) {
-            $this->registry->addFacet($facetId, $facet);
+            $this->registry->addFacet((string) $facetId, $facet);
         }
     }
 

src/Finder/ShopProductsFinder.php

@@ -40,7 +40,7 @@ public function find(array $data): Pagerfanta
                     continue;
                 }
 
-                $facet = $this->facetRegistry->getFacetById($facetId);
+                $facet = $this->facetRegistry->getFacetById((string) $facetId);
                 $boolQuery->addFilter($facet->getQuery($selectedBuckets));
             }
         }

src/Form/Resolver/FacetsResolver.php

@@ -32,7 +32,7 @@ public function resolveFacets(FormEvent $event, string $namePropertyPrefix): Pag
         $query = $this->queryBuilder->getQuery($event);
 
         foreach ($this->facetRegistry->getFacets() as $facetId => $facet) {
-            $query->addAggregation($facet->getAggregation()->setName($facetId));
+            $query->addAggregation($facet->getAggregation()->setName((string) $facetId));
         }
 
         $query->setSize(0);

src/Form/Resolver/ProductsFilterFacetResolver.php

@@ -30,7 +30,7 @@ public function resolveFacets(FormEvent $event, string $namePropertyPrefix): Pag
         $query = $this->queryBuilder->getQuery($event, $namePropertyPrefix);
 
         foreach ($this->facetRegistry->getFacets() as $facetId => $facet) {
-            $query->addAggregation($facet->getAggregation()->setName($facetId));
+            $query->addAggregation($facet->getAggregation()->setName((string) $facetId));
         }
 
         $query->setSize(0);

src/Form/Type/SearchFacetsType.php

@@ -28,15 +28,15 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         foreach ($options['facets'] as $facetId => $facetData) {
-            $facet = $this->facetRegistry->getFacetById($facetId);
+            $facet = $this->facetRegistry->getFacetById((string) $facetId);
             $choices = [];
             foreach ($facetData['buckets'] as $bucket) {
                 $choices[$facet->getBucketLabel($bucket)] = $bucket['key'];
             }
             if ([] !== $choices) {
                 $builder
                     ->add(
-                        $facetId,
+                        (string) $facetId,
                         ChoiceType::class,
                         [
                             'label' => $facet->getLabel(),

src/QueryBuilder/FormQueryBuilder/SiteWideFacetsQueryBuilder.php

@@ -39,7 +39,7 @@ public function getQuery(FormEvent $event): Query
                 continue;
             }
 
-            $facet = $this->facetRegistry->getFacetById($facetId);
+            $facet = $this->facetRegistry->getFacetById((string) $facetId);
             $boolQuery->addFilter($facet->getQuery($selectedBuckets));
         }
 

src/QueryBuilder/FormQueryBuilder/TaxonFacetsQueryBuilder.php

@@ -42,7 +42,7 @@ public function getQuery(FormEvent $event, string $namePropertyPrefix): Query
                 continue;
             }
 
-            $facet = $this->facetRegistry->getFacetById($facetId);
+            $facet = $this->facetRegistry->getFacetById((string) $facetId);
             $boolQuery->addFilter($facet->getQuery($selectedBuckets));
         }