refactoring of long lines

dolmit-tanel-paaro · dolmit-tanel-paaro · commit 9b70410c220b · 2025-04-11T15:05:26.000+03:00
diff --git a/src/FilterService/FilterType/MultiSelect.php b/src/FilterService/FilterType/MultiSelect.php
@@ -84,10 +84,16 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
 
                 if ($filterDefinition->getUseAndCondition()) {
                     foreach ($quotedValues as $value) {
-                        $productList->addCondition($field . ' = ' . $value, $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+                        $productList->addCondition(
+                            $field . ' = ' . $value,
+                            $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+                        );
                     }
                 } else {
-                    $productList->addCondition($field . ' IN (' . implode(',', $quotedValues) . ')', $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+                    $productList->addCondition(
+                        $field . ' IN (' . implode(',', $quotedValues) . ')',
+                        $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+                    );
                 }
             }
         }
diff --git a/src/FilterService/FilterType/MultiSelectRelation.php b/src/FilterService/FilterType/MultiSelectRelation.php
@@ -127,10 +127,16 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             if (!empty($quotedValues)) {
                 if ($filterDefinition->getUseAndCondition()) {
                     foreach ($quotedValues as $value) {
-                        $productList->addRelationCondition($isPrecondition ? self::PREFIX_PRECONDITION . $field : $field, 'dest = ' . $value);
+                        $productList->addRelationCondition(
+                            $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field,
+                            'dest = ' . $value
+                        );
                     }
                 } else {
-                    $productList->addRelationCondition($isPrecondition ? self::PREFIX_PRECONDITION . $field : $field, 'dest IN (' . implode(',', $quotedValues) . ')');
+                    $productList->addRelationCondition(
+                        $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field,
+                        'dest IN (' . implode(',', $quotedValues) . ')'
+                    );
                 }
             }
         }
diff --git a/src/FilterService/FilterType/NumberRange.php b/src/FilterService/FilterType/NumberRange.php
@@ -54,10 +54,16 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
         $to = $value['to'] ?? null;
 
         if ($from && $from !== AbstractFilterType::EMPTY_STRING) {
-            $productList->addCondition($field . ' >= ' . $db->quote($from), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+            $productList->addCondition(
+                $field . ' >= ' . $db->quote($from),
+                $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+            );
         }
         if ($to && $to !== AbstractFilterType::EMPTY_STRING) {
-            $productList->addCondition($field . ' <= ' . $db->quote($to), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+            $productList->addCondition(
+                $field . ' <= ' . $db->quote($to),
+                $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+            );
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/NumberRangeSelection.php b/src/FilterService/FilterType/NumberRangeSelection.php
@@ -125,10 +125,16 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
 
         if (!empty($value)) {
             if (!empty($value['from'])) {
-                $productList->addCondition($field . ' >= ' . $db->quote($value['from']), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+                $productList->addCondition(
+                    $field . ' >= ' . $db->quote($value['from']),
+                    $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+                );
             }
             if (!empty($value['to'])) {
-                $productList->addCondition($field . ' < ' . $db->quote($value['to']), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+                $productList->addCondition(
+                    $field . ' < ' . $db->quote($value['to']),
+                    $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+                );
             }
         }
 
diff --git a/src/FilterService/FilterType/Select.php b/src/FilterService/FilterType/Select.php
@@ -56,7 +56,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
 
         if (!empty($value)) {
             $db = Db::get();
-            $productList->addCondition('TRIM(`' . $field . '`) = ' . $db->quote($value), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+            $productList->addCondition(
+                'TRIM(`' . $field . '`) = ' . $db->quote($value),
+                $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+            );
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SelectCategory.php b/src/FilterService/FilterType/SelectCategory.php
@@ -100,7 +100,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             $value = '%,' . trim((string)$value) . ',%';
 
             $db = Db::get();
-            $productList->addCondition($field . ' LIKE ' . $db->quote($value), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);
+            $productList->addCondition(
+                $field . ' LIKE ' . $db->quote($value),
+                $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field
+            );
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SelectRelation.php b/src/FilterService/FilterType/SelectRelation.php
@@ -108,7 +108,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
 
         $db = Db::get();
         if (!empty($value)) {
-            $productList->addRelationCondition($isPrecondition ? self::PREFIX_PRECONDITION . $field : $field, 'dest = ' . $db->quote($value));
+            $productList->addRelationCondition(
+                $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field,
+                'dest = ' . $db->quote($value)
+            );
         }
 
         return $currentFilter;

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,16 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`84`	`84`
`85`	`85`	`if ($filterDefinition->getUseAndCondition()) {`
`86`	`86`	`foreach ($quotedValues as $value) {`
`87`		`- $productList->addCondition($field . ' = ' . $value, $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);`
	`87`	`+ $productList->addCondition(`
	`88`	`+ $field . ' = ' . $value,`
	`89`	`+ $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field`
	`90`	`+ );`
`88`	`91`	`}`
`89`	`92`	`} else {`
`90`		`- $productList->addCondition($field . ' IN (' . implode(',', $quotedValues) . ')', $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);`
	`93`	`+ $productList->addCondition(`
	`94`	`+ $field . ' IN (' . implode(',', $quotedValues) . ')',`
	`95`	`+ $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field`
	`96`	`+ );`
`91`	`97`	`}`
`92`	`98`	`}`
`93`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,16 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`127`	`127`	`if (!empty($quotedValues)) {`
`128`	`128`	`if ($filterDefinition->getUseAndCondition()) {`
`129`	`129`	`foreach ($quotedValues as $value) {`
`130`		`- $productList->addRelationCondition($isPrecondition ? self::PREFIX_PRECONDITION . $field : $field, 'dest = ' . $value);`
	`130`	`+ $productList->addRelationCondition(`
	`131`	`+ $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field,`
	`132`	`+ 'dest = ' . $value`
	`133`	`+ );`
`131`	`134`	`}`
`132`	`135`	`} else {`
`133`		`- $productList->addRelationCondition($isPrecondition ? self::PREFIX_PRECONDITION . $field : $field, 'dest IN (' . implode(',', $quotedValues) . ')');`
	`136`	`+ $productList->addRelationCondition(`
	`137`	`+ $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field,`
	`138`	`+ 'dest IN (' . implode(',', $quotedValues) . ')'`
	`139`	`+ );`
`134`	`140`	`}`
`135`	`141`	`}`
`136`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,16 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`125`	`125`
`126`	`126`	`if (!empty($value)) {`
`127`	`127`	`if (!empty($value['from'])) {`
`128`		`- $productList->addCondition($field . ' >= ' . $db->quote($value['from']), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);`
	`128`	`+ $productList->addCondition(`
	`129`	`+ $field . ' >= ' . $db->quote($value['from']),`
	`130`	`+ $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field`
	`131`	`+ );`
`129`	`132`	`}`
`130`	`133`	`if (!empty($value['to'])) {`
`131`		`- $productList->addCondition($field . ' < ' . $db->quote($value['to']), $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field);`
	`134`	`+ $productList->addCondition(`
	`135`	`+ $field . ' < ' . $db->quote($value['to']),`
	`136`	`+ $isPrecondition ? self::PREFIX_PRECONDITION . $field : $field`
	`137`	`+ );`
`132`	`138`	`}`
`133`	`139`	`}`
`134`	`140`