Allow multiple taxons for one option

src/PropertyBuilder/OptionTaxonsBuilder.php

@@ -68,17 +68,19 @@ public function consumeEvent(TransformEvent $event): void
         /** @var ProductOptionValueInterface $optionValue */
         foreach ($optionValues as $optionValue) {
             $option = $optionValue->getOption();
-            $productVariant = $this->productVariantRepository->findOneByOptionValue($optionValue);
+            $productVariants = $this->productVariantRepository->findOneByOptionValue($optionValue);
 
-            if (null === $productVariant) {
-                continue;
-            }
+            foreach ($productVariants as $productVariant) {
+                if (null === $productVariant) {
+                    continue;
+                }
 
-            /** @var ProductInterface $product */
-            $product = $productVariant->getProduct();
+                /** @var ProductInterface $product */
+                $product = $productVariant->getProduct();
 
-            if ($documentProductOption === $option && $product->isEnabled()) {
-                $taxons = $this->productTaxonsMapper->mapToUniqueCodes($product);
+                if ($documentProductOption === $option && $product->isEnabled()) {
+                    $taxons = $this->productTaxonsMapper->mapToUniqueCodes($product);
+                }
             }
         }
 

src/QueryBuilder/ContainsNameQueryBuilder.php

@@ -14,7 +14,7 @@
 
 use BitBag\SyliusElasticsearchPlugin\PropertyNameResolver\ConcatedNameResolverInterface;
 use Elastica\Query\AbstractQuery;
-use Elastica\Query\Match;
+use Elastica\Query\MatchQuery;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
 
 final class ContainsNameQueryBuilder implements QueryBuilderInterface
@@ -47,7 +47,7 @@ public function buildQuery(array $data): ?AbstractQuery
             return null;
         }
 
-        $nameQuery = new Match();
+        $nameQuery = new MatchQuery();
 
         $nameQuery->setFieldQuery($propertyName, $name);
         $nameQuery->setFieldFuzziness($propertyName, 2);

src/Repository/ProductVariantRepository.php

@@ -27,14 +27,13 @@ public function __construct(BaseProductVariantRepositoryInterface $baseProductVa
         $this->baseProductVariantRepository = $baseProductVariantRepository;
     }
 
-    public function findOneByOptionValue(ProductOptionValueInterface $productOptionValue): ?ProductVariantInterface
+    public function findOneByOptionValue(ProductOptionValueInterface $productOptionValue): array
     {
         return $this->baseProductVariantRepository->createQueryBuilder('o')
             ->where(':optionValue MEMBER OF o.optionValues')
             ->setParameter('optionValue', $productOptionValue)
             ->getQuery()
-            ->setMaxResults(1)
-            ->getOneOrNullResult()
+            ->getResult()
         ;
     }
 }

src/Repository/ProductVariantRepositoryInterface.php

@@ -17,5 +17,5 @@
 
 interface ProductVariantRepositoryInterface
 {
-    public function findOneByOptionValue(ProductOptionValueInterface $productOptionValue): ?ProductVariantInterface;
+    public function findOneByOptionValue(ProductOptionValueInterface $productOptionValue): array;
 }