making changes to the edited code during refactor

BitBagCommerce · Aug 22, 2022 · 4394ca4 · 4394ca4
1 parent 6c3d333
commit 4394ca4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/src/Checker/Rule/Elasticsearch/AttributeRule.php b/src/Checker/Rule/Elasticsearch/AttributeRule.php
@@ -35,7 +35,6 @@ public function __construct(
         $this->attributeNameResolver = $attributeNameResolver;
     }
 
-    /* @phpstan-ignore-next-line Elastica\Query\Term Class extended by Elastica\Query\AbstractQuery*/
     public function createSubquery(array $configuration): AbstractQuery
     {
         /** @var AttributeInterface $attribute */
@@ -51,6 +50,7 @@ public function createSubquery(array $configuration): AbstractQuery
         $term = new Term();
         $term->setTerm($paramName, $value);
 
+        /* @phpstan-ignore-next-line Elastica\Query\Term Class extended by Elastica\Query\AbstractQuery*/
         return $term;
     }
 }
diff --git a/src/Checker/Rule/Elasticsearch/PriceRule.php b/src/Checker/Rule/Elasticsearch/PriceRule.php
@@ -30,7 +30,6 @@ public function __construct(
         $this->propertyNameResolver = $propertyNameResolver;
     }
 
-    /* @phpstan-ignore-next-line Elastica\Query\Range Class extended by Elastica\Query\AbstractQuery*/
     public function createSubquery(array $configuration): AbstractQuery
     {
         /** @var string|null $currentChannel */
@@ -68,6 +67,7 @@ public function createSubquery(array $configuration): AbstractQuery
             'lte' => $maxPrice,
         ]);
 
+        /* @phpstan-ignore-next-line Elastica\Query\Range Class extended by Elastica\Query\AbstractQuery*/
         return $rangeQuery;
     }
 }
diff --git a/src/Checker/Rule/Elasticsearch/ProductNameRule.php b/src/Checker/Rule/Elasticsearch/ProductNameRule.php
@@ -29,7 +29,6 @@ public function __construct(
         $this->productNameNameResolver = $productNameNameResolver;
     }
 
-    /* @phpstan-ignore-next-line Elastica\Query\MatchQuery Class extended by Elastica\Query\AbstractQuery*/
     public function createSubquery(array $configuration): AbstractQuery
     {
         $name = $configuration['catalogName'];
@@ -39,6 +38,7 @@ public function createSubquery(array $configuration): AbstractQuery
         $nameQuery = new MatchQuery($propertyName, $name);
         $nameQuery->setFieldQuery($propertyName, $name);
 
+        /* @phpstan-ignore-next-line Elastica\Query\MatchQuery Class extended by Elastica\Query\AbstractQuery*/
         return $nameQuery;
     }
 }
diff --git a/src/Checker/Rule/Elasticsearch/TaxonRule.php b/src/Checker/Rule/Elasticsearch/TaxonRule.php
@@ -23,7 +23,6 @@ public function __construct(string $taxonsProperty)
         $this->taxonsProperty = $taxonsProperty;
     }
 
-    /* @phpstan-ignore-next-line Elastica\Query\Terms Class extended by Elastica\Query\AbstractQuery*/
     public function createSubquery(array $configuration): AbstractQuery
     {
         $taxonsCodes = array_map(
@@ -33,6 +32,7 @@ function (Taxon $taxon) {
             $configuration['taxons']->toArray()
         );
 
+        /* @phpstan-ignore-next-line Elastica\Query\Terms Class extended by Elastica\Query\AbstractQuery*/
         return new Terms($this->taxonsProperty, $taxonsCodes);
     }
 }
diff --git a/src/Fixture/Factory/CatalogFixtureFactory.php b/src/Fixture/Factory/CatalogFixtureFactory.php
@@ -52,15 +52,15 @@ private function createCatalog(string $code, array $catalogData): void
         $catalog = $this->catalogFactory->createNew();
         $catalog->setCode($code);
 
-        if (0 !== count($catalogData['starts_at'])) {
+        if (0 !== strlen(trim($catalogData['starts_at']))) {
             $catalog->setStartDate(new \DateTime($catalogData['starts_at']));
         }
 
-        if (0 !== count($catalogData['ends_at'])) {
+        if (0 !== strlen(trim($catalogData['ends_at']))) {
             $catalog->setEndDate(new \DateTime($catalogData['ends_at']));
         }
 
-        if (0 !== count($catalogData['template'])) {
+        if (0 !== strlen(trim($catalogData['template']))) {
             $catalog->setTemplate($catalogData['template']);
         }
 

diff --git a/src/Resolver/CatalogsForProductResolver.php b/src/Resolver/CatalogsForProductResolver.php
@@ -55,8 +55,7 @@ public function resolveProductCatalogs(ProductInterface $product, \DateTimeImmut
                 /** @var Collection<int, CatalogRuleInterface> $rules */
                 $rules = $activeCatalog->getProductAssociationRules();
 
-                /** @var QueryBuilder $qb */
-                $qb = $this->productRepository->createQueryBuilder('p')
+                $qb = $this->productRepository->createQueryBuilder('p') /** @phpstan-ignore-line ProductRepository inherits the createQueryBuilder method from EntityRepository*/
                     ->select('count(p.code)')
                     ->leftJoin('p.translations', 'name')
                     ->leftJoin('p.variants', 'variant')

diff --git a/src/Resolver/Elasticsearch/ProductsInsideCatalogResolver.php b/src/Resolver/Elasticsearch/ProductsInsideCatalogResolver.php
@@ -46,6 +46,7 @@ public function findMatchingProducts(CatalogInterface $catalog): array
         }
 
         if ((bool) $catalog->getRules()->count()) {
+            /** @var BoolQuery $query */
             $query = $this->productQueryBuilder->findMatchingProductsQuery($catalog->getConnectingRules(), $catalog->getRules());
         }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             if ((bool) $catalog->getRules()->count()) {
+                /** @var BoolQuery $query */
                 $query = $this->productQueryBuilder->findMatchingProductsQuery($catalog->getConnectingRules(), $catalog->getRules());
             }
@@ Expand Down @@