restore querybuilders and repositories from master

src/QueryBuilder/FormQueryBuilder/SiteWideFacetsQueryBuilder.php

@@ -30,13 +30,10 @@ public function getQuery(FormEvent $event): Query
         /** @var Search $data */
         $data = $event->getData();
 
-        /** @var Query\BoolQuery $boolQuery */
         $boolQuery = $this->queryBuilder->buildQuery([
-            /** @phpstan-ignore-next-line */
             'query' => $data['box']['query'] ?? '',
         ]);
 
-        /** @phpstan-ignore-next-line */
         foreach ($data['facets'] ?? [] as $facetId => $selectedBuckets) {
             if (!$selectedBuckets) {
                 continue;

src/QueryBuilder/FormQueryBuilder/TaxonFacetsQueryBuilder.php

@@ -34,7 +34,6 @@ public function getQuery(FormEvent $event, string $namePropertyPrefix): Query
 
         $data = $this->shopProductListDataHandler->retrieveData($eventData);
 
-        /** @var Query\BoolQuery $boolQuery */
         $boolQuery = $this->searchProductsQueryBuilder->buildQuery($data);
 
         foreach ($data['facets'] ?? [] as $facetId => $selectedBuckets) {

src/Repository/OrderItemRepository.php

@@ -25,13 +25,11 @@ public function __construct(
 
     public function countByVariant(ProductVariantInterface $variant, array $orderStates = []): int
     {
-        if ([] !== $orderStates) {
+        if (empty($orderStates)) {
             $orderStates = [OrderInterface::STATE_CANCELLED, OrderInterface::STATE_CART];
         }
-        /** @var EntityRepository $queryBuilder */
-        $queryBuilder = $this->baseOrderItemRepository;
 
-        return (int) ($queryBuilder
+        return (int) ($this->baseOrderItemRepository
             ->createQueryBuilder('oi')
             ->select('SUM(oi.quantity)')
             ->join('oi.order', 'o')

src/Repository/ProductAttributeRepository.php

@@ -12,7 +12,7 @@
 
 namespace BitBag\SyliusElasticsearchPlugin\Repository;
 
-use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
 class ProductAttributeRepository implements ProductAttributeRepositoryInterface
@@ -24,11 +24,10 @@ public function __construct(
 
     public function getAttributeTypeByName(string $attributeName): string
     {
-        /** @var EntityRepository $queryBuilder */
-        $queryBuilder = $this->productAttributeRepository;
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $this->productAttributeRepository->createQueryBuilder('p');
 
         $result = $queryBuilder
-            ->createQueryBuilder('p')
             ->select('p.type')
             ->where('p.code = :code')
             ->setParameter(':code', $attributeName)
@@ -40,24 +39,21 @@ public function getAttributeTypeByName(string $attributeName): string
 
     public function findAllWithTranslations(?string $locale): array
     {
-        /** @var EntityRepository $queryBuilder */
-        $queryBuilder = $this->productAttributeRepository;
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $this->productAttributeRepository->createQueryBuilder('o');
 
         if (null !== $locale) {
             $queryBuilder
-                ->createQueryBuilder('o')
                 ->addSelect('translation')
-                /** @phpstan-ignore-next-line */
                 ->leftJoin('o.translations', 'translation', 'ot')
                 ->andWhere('translation.locale = :locale')
                 ->setParameter('locale', $locale)
             ;
         }
 
         return $queryBuilder
-            ->createQueryBuilder('o')
             ->getQuery()
             ->getResult()
-            ;
+        ;
     }
 }

src/Repository/ProductAttributeValueRepository.php

@@ -12,7 +12,6 @@
 
 namespace BitBag\SyliusElasticsearchPlugin\Repository;
 
-use Doctrine\ORM\EntityRepository;
 use Sylius\Component\Attribute\Model\AttributeInterface;
 use Sylius\Component\Product\Repository\ProductAttributeValueRepositoryInterface as BaseAttributeValueRepositoryInterface;
 use Sylius\Component\Taxonomy\Model\Taxon;
@@ -27,31 +26,26 @@ public function __construct(
 
     public function getUniqueAttributeValues(AttributeInterface $productAttribute, Taxon $taxon): array
     {
-        /** @var EntityRepository $queryBuilder */
-        $queryBuilder = $this->baseAttributeValueRepository;
+        $queryBuilder = $this->baseAttributeValueRepository->createQueryBuilder('o');
 
         /** @var string|null $storageType */
         $storageType = $productAttribute->getStorageType();
 
         $queryBuilder
-            ->createQueryBuilder('o')
             ->join('o.subject', 'p', 'WITH', 'p.enabled = 1')
             ->join('p.productTaxons', 't', 'WITH', 't.product = p.id')
             ->select('o.localeCode, o.' . $storageType . ' as value')
             ->andWhere('t.taxon = :taxon');
 
         if (true === $this->includeAllDescendants) {
-            $queryBuilder
-                ->createQueryBuilder('o')
-                ->innerJoin('t.taxon', 'taxon')
+            $queryBuilder->innerJoin('t.taxon', 'taxon')
                 ->orWhere('taxon.left >= :taxonLeft and taxon.right <= :taxonRight and taxon.root = :taxonRoot')
                 ->setParameter('taxonLeft', $taxon->getLeft())
                 ->setParameter('taxonRight', $taxon->getRight())
                 ->setParameter('taxonRoot', $taxon->getRoot());
         }
 
         return $queryBuilder
-            ->createQueryBuilder('o')
             ->andWhere('o.attribute = :attribute')
             ->groupBy('o.' . $storageType)
             ->addGroupBy('o.localeCode')

src/Repository/ProductOptionRepository.php

@@ -12,7 +12,7 @@
 
 namespace BitBag\SyliusElasticsearchPlugin\Repository;
 
-use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
 class ProductOptionRepository implements ProductOptionRepositoryInterface
@@ -24,24 +24,21 @@ public function __construct(
 
     public function findAllWithTranslations(?string $locale): array
     {
-        /** @var EntityRepository $queryBuilder */
-        $queryBuilder = $this->productOptionRepository;
+        /** @var QueryBuilder $queryBuilder */
+        $queryBuilder = $this->productOptionRepository->createQueryBuilder('o');
 
         if (null !== $locale) {
             $queryBuilder
-                ->createQueryBuilder('o')
                 ->addSelect('translation')
-                /** @phpstan-ignore-next-line */
                 ->leftJoin('o.translations', 'translation', 'ot')
                 ->andWhere('translation.locale = :locale')
                 ->setParameter('locale', $locale)
             ;
         }
 
         return $queryBuilder
-            ->createQueryBuilder('o')
             ->getQuery()
             ->getResult()
-            ;
+        ;
     }
 }

src/Repository/ProductVariantRepository.php

@@ -26,28 +26,22 @@ public function __construct(
 
     public function findOneByOptionValue(ProductOptionValueInterface $productOptionValue): ?ProductVariantInterface
     {
-        /** @var EntityRepository $baseProductVariantRepository */
-        $baseProductVariantRepository = $this->baseProductVariantRepository;
-
-        return $baseProductVariantRepository->createQueryBuilder('o')
+        return $this->baseProductVariantRepository->createQueryBuilder('o')
             ->where(':optionValue MEMBER OF o.optionValues')
             ->setParameter('optionValue', $productOptionValue)
             ->getQuery()
             ->setMaxResults(1)
             ->getOneOrNullResult()
-            ;
+        ;
     }
 
     public function findByOptionValue(ProductOptionValueInterface $productOptionValue): array
     {
-        /** @var EntityRepository $baseProductVariantRepository */
-        $baseProductVariantRepository = $this->baseProductVariantRepository;
-
-        return $baseProductVariantRepository->createQueryBuilder('o')
+        return $this->baseProductVariantRepository->createQueryBuilder('o')
             ->where(':optionValue MEMBER OF o.optionValues')
             ->setParameter('optionValue', $productOptionValue)
             ->getQuery()
             ->getResult()
-            ;
+        ;
     }
 }

src/Repository/TaxonRepository.php

@@ -30,21 +30,15 @@ public function __construct(
 
     public function getTaxonsByAttributeViaProduct(AttributeInterface $attribute): array
     {
-        /** @var EntityRepository $baseTaxonRepository */
-        $baseTaxonRepository = $this->baseTaxonRepository;
-
-        /** @var EntityRepository $productRepository */
-        $productRepository = $this->productRepository;
-
-        return $baseTaxonRepository
+        return $this->baseTaxonRepository
             ->createQueryBuilder('t')
             ->distinct(true)
             ->select('t')
             ->leftJoin($this->productTaxonEntityClass, 'pt', Join::WITH, 'pt.taxon = t.id')
             ->where(
                 'pt.product IN(' .
-                $productRepository
-                    ->createQueryBuilder('p')
+                $this
+                    ->productRepository->createQueryBuilder('p')
                     ->leftJoin($this->productAttributeEntityClass, 'pav', Join::WITH, 'pav.subject = p.id')
                     ->where('pav.attribute = :attribute')
                     ->getQuery()
@@ -54,6 +48,6 @@ public function getTaxonsByAttributeViaProduct(AttributeInterface $attribute): a
             ->setParameter(':attribute', $attribute)
             ->getQuery()
             ->getResult()
-            ;
+        ;
     }
 }