fix code quality issues

dolmit-tanel-paaro · dolmit-tanel-paaro · commit 33fe854eb51e · 2025-05-30T11:50:18.000+03:00
Ref: https://sonarcloud.io/summary/new_code?id=pimcore_ecommerce-framework-bundle&pullRequest=249
diff --git a/src/IndexService/ProductList/DefaultMysql.php b/src/IndexService/ProductList/DefaultMysql.php
@@ -51,6 +51,8 @@ class DefaultMysql implements ProductListInterface
 
     protected LoggerInterface $logger;
 
+    private const AND = ' AND ';
+
     public function __construct(MysqlConfigInterface $tenantConfig, LoggerInterface $pimcoreEcommerceSqlLogger)
     {
         $this->tenantName = $tenantConfig->getTenantName();
@@ -100,9 +102,10 @@ public function resetCondition(string $fieldname): void
     public function addRelationCondition(string $fieldname, string|array $condition): void
     {
         $realFieldname = $this->getRealFieldname($fieldname);
+        $fieldnameCondition = '`fieldname` = ' . $this->quote($realFieldname);
 
         $this->products = null;
-        $this->relationConditions[$fieldname][] = '`fieldname` = ' . $this->quote($realFieldname) . ' AND '  . $condition;
+        $this->relationConditions[$fieldname][] = $fieldnameCondition . self::AND  . $condition;
     }
 
     /**
@@ -470,18 +473,18 @@ protected function buildQueryFromConditions(bool $excludeConditions = false, ?st
             $variantMode = $this->getVariantMode();
         }
 
-        $preCondition = 'active = 1 AND virtualProductActive = 1';
+        $preCondition = 'active = 1' . self::AND . 'virtualProductActive = 1';
         if ($this->inProductList) {
-            $preCondition .= ' AND inProductList = 1';
+            $preCondition .= self::AND . 'inProductList = 1';
         }
 
         $tenantCondition = $this->getCurrentTenantConfig()->getCondition();
         if ($tenantCondition) {
-            $preCondition .= ' AND ' . $tenantCondition;
+            $preCondition .= self::AND . $tenantCondition;
         }
 
         if ($this->getCategory()) {
-            $preCondition .= " AND parentCategoryIds LIKE '%," . $this->getCategory()->getId() . ",%'";
+            $preCondition .= self::AND . "parentCategoryIds LIKE '%," . $this->getCategory()->getId() . ",%'";
         }
 
         $condition = $preCondition;
@@ -492,27 +495,27 @@ protected function buildQueryFromConditions(bool $excludeConditions = false, ?st
             case ProductListInterface::VARIANT_MODE_INCLUDE_PARENT_OBJECT:
 
                 //make sure, that only variant objects are considered
-                $condition .= ' AND a.id != virtualProductId ';
+                $condition .= self::AND . 'a.id != virtualProductId ';
 
                 break;
 
             case ProductListInterface::VARIANT_MODE_HIDE:
 
-                $condition .= " AND `type` != 'variant'";
+                $condition .= self::AND . "`type` != 'variant'";
 
                 break;
 
             case ProductListInterface::VARIANT_MODE_VARIANTS_ONLY:
 
-                $condition .= " AND `type` = 'variant'";
+                $condition .= self::AND . "`type` = 'variant'";
 
                 break;
         }
 
         if (!$excludeConditions) {
             $userspecific = $this->buildUserspecificConditions($excludedFieldname);
             if ($userspecific) {
-                $condition .= ' AND ' . $userspecific;
+                $condition .= self::AND . $userspecific;
             }
         }
 
@@ -529,7 +532,7 @@ protected function buildQueryFromConditions(bool $excludeConditions = false, ?st
                 }
             }
 
-            $condition .= ' AND ' . $this->resource->buildFulltextSearchWhere($this->tenantConfig->getSearchAttributes(), $searchstring);
+            $condition .= self::AND . $this->resource->buildFulltextSearchWhere($this->tenantConfig->getSearchAttributes(), $searchstring);
         }
 
         $this->logger->info('Total Condition: ' . $condition);
@@ -544,7 +547,7 @@ protected function buildUserspecificConditions(?string $excludedFieldname = null
             if ($fieldname !== $excludedFieldname) {
                 foreach ($condArray as $cond) {
                     if ($condition) {
-                        $condition .= ' AND ';
+                        $condition .= self::AND;
                     }
 
                     $condition .= 'a.id IN (SELECT DISTINCT src FROM ' . $this->getCurrentTenantConfig()->getRelationTablename() . ' WHERE ' . $cond . ')';
@@ -556,7 +559,7 @@ protected function buildUserspecificConditions(?string $excludedFieldname = null
             if ($fieldname !== $excludedFieldname) {
                 foreach ($condArray as $cond) {
                     if ($condition) {
-                        $condition .= ' AND ';
+                        $condition .= self::AND;
                     }
 
                     $condition .= is_array($cond)

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ class DefaultMysql implements ProductListInterface`
`51`	`51`
`52`	`52`	`protected LoggerInterface $logger;`
`53`	`53`
	`54`	`+ private const AND = ' AND ';`
	`55`	`+`
`54`	`56`	`public function __construct(MysqlConfigInterface $tenantConfig, LoggerInterface $pimcoreEcommerceSqlLogger)`
`55`	`57`	`{`
`56`	`58`	`$this->tenantName = $tenantConfig->getTenantName();`
`@@ -100,9 +102,10 @@ public function resetCondition(string $fieldname): void`
`100`	`102`	`public function addRelationCondition(string $fieldname, string\|array $condition): void`
`101`	`103`	`{`
`102`	`104`	`$realFieldname = $this->getRealFieldname($fieldname);`
	`105`	+ $fieldnameCondition = '`fieldname` = ' . $this->quote($realFieldname);
`103`	`106`
`104`	`107`	`$this->products = null;`
`105`		- $this->relationConditions[$fieldname][] = '`fieldname` = ' . $this->quote($realFieldname) . ' AND ' . $condition;
	`108`	`+ $this->relationConditions[$fieldname][] = $fieldnameCondition . self::AND . $condition;`
`106`	`109`	`}`
`107`	`110`
`108`	`111`	`/**`
`@@ -470,18 +473,18 @@ protected function buildQueryFromConditions(bool $excludeConditions = false, ?st`
`470`	`473`	`$variantMode = $this->getVariantMode();`
`471`	`474`	`}`
`472`	`475`
`473`		`- $preCondition = 'active = 1 AND virtualProductActive = 1';`
	`476`	`+ $preCondition = 'active = 1' . self::AND . 'virtualProductActive = 1';`
`474`	`477`	`if ($this->inProductList) {`
`475`		`- $preCondition .= ' AND inProductList = 1';`
	`478`	`+ $preCondition .= self::AND . 'inProductList = 1';`
`476`	`479`	`}`
`477`	`480`
`478`	`481`	`$tenantCondition = $this->getCurrentTenantConfig()->getCondition();`
`479`	`482`	`if ($tenantCondition) {`
`480`		`- $preCondition .= ' AND ' . $tenantCondition;`
	`483`	`+ $preCondition .= self::AND . $tenantCondition;`
`481`	`484`	`}`
`482`	`485`
`483`	`486`	`if ($this->getCategory()) {`
`484`		`- $preCondition .= " AND parentCategoryIds LIKE '%," . $this->getCategory()->getId() . ",%'";`
	`487`	`+ $preCondition .= self::AND . "parentCategoryIds LIKE '%," . $this->getCategory()->getId() . ",%'";`
`485`	`488`	`}`
`486`	`489`
`487`	`490`	`$condition = $preCondition;`
`@@ -492,27 +495,27 @@ protected function buildQueryFromConditions(bool $excludeConditions = false, ?st`
`492`	`495`	`case ProductListInterface::VARIANT_MODE_INCLUDE_PARENT_OBJECT:`
`493`	`496`
`494`	`497`	`//make sure, that only variant objects are considered`
`495`		`- $condition .= ' AND a.id != virtualProductId ';`
	`498`	`+ $condition .= self::AND . 'a.id != virtualProductId ';`
`496`	`499`
`497`	`500`	`break;`
`498`	`501`
`499`	`502`	`case ProductListInterface::VARIANT_MODE_HIDE:`
`500`	`503`
`501`		- $condition .= " AND `type` != 'variant'";
	`504`	+ $condition .= self::AND . "`type` != 'variant'";
`502`	`505`
`503`	`506`	`break;`
`504`	`507`
`505`	`508`	`case ProductListInterface::VARIANT_MODE_VARIANTS_ONLY:`
`506`	`509`
`507`		- $condition .= " AND `type` = 'variant'";
	`510`	+ $condition .= self::AND . "`type` = 'variant'";
`508`	`511`
`509`	`512`	`break;`
`510`	`513`	`}`
`511`	`514`
`512`	`515`	`if (!$excludeConditions) {`
`513`	`516`	`$userspecific = $this->buildUserspecificConditions($excludedFieldname);`
`514`	`517`	`if ($userspecific) {`
`515`		`- $condition .= ' AND ' . $userspecific;`
	`518`	`+ $condition .= self::AND . $userspecific;`
`516`	`519`	`}`
`517`	`520`	`}`
`518`	`521`
`@@ -529,7 +532,7 @@ protected function buildQueryFromConditions(bool $excludeConditions = false, ?st`
`529`	`532`	`}`
`530`	`533`	`}`
`531`	`534`
`532`		`- $condition .= ' AND ' . $this->resource->buildFulltextSearchWhere($this->tenantConfig->getSearchAttributes(), $searchstring);`
	`535`	`+ $condition .= self::AND . $this->resource->buildFulltextSearchWhere($this->tenantConfig->getSearchAttributes(), $searchstring);`
`533`	`536`	`}`
`534`	`537`
`535`	`538`	`$this->logger->info('Total Condition: ' . $condition);`
`@@ -544,7 +547,7 @@ protected function buildUserspecificConditions(?string $excludedFieldname = null`
`544`	`547`	`if ($fieldname !== $excludedFieldname) {`
`545`	`548`	`foreach ($condArray as $cond) {`
`546`	`549`	`if ($condition) {`
`547`		`- $condition .= ' AND ';`
	`550`	`+ $condition .= self::AND;`
`548`	`551`	`}`
`549`	`552`
`550`	`553`	`$condition .= 'a.id IN (SELECT DISTINCT src FROM ' . $this->getCurrentTenantConfig()->getRelationTablename() . ' WHERE ' . $cond . ')';`
`@@ -556,7 +559,7 @@ protected function buildUserspecificConditions(?string $excludedFieldname = null`
`556`	`559`	`if ($fieldname !== $excludedFieldname) {`
`557`	`560`	`foreach ($condArray as $cond) {`
`558`	`561`	`if ($condition) {`
`559`		`- $condition .= ' AND ';`
	`562`	`+ $condition .= self::AND;`
`560`	`563`	`}`
`561`	`564`
`562`	`565`	`$condition .= is_array($cond)`