fix phpStan, phpMD, CodeStyle

OXID-eSales · Aug 29, 2024 · 3044b19 · 3044b19
1 parent 295e945
commit 3044b19
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/Controller/Admin/OrderList.php b/src/Controller/Admin/OrderList.php
@@ -54,7 +54,10 @@ protected function prepareWhereQuery($whereQuery, $fullQuery)
             $oxOrderNr = $connectionProvider->quoteIdentifier("oxorder.oxordernr");
             $oxUnzerOrderNr = $connectionProvider->quoteIdentifier("oxorder.oxunzerordernr");
             $orderNrValue = $connectionProvider->quote($orderNrSearch);
-            $query .= " and ($oxOrderNr like $orderNrValue or $oxUnzerOrderNr like $orderNrValue) ";
+            $orderNrValue = is_string($orderNrValue) ? $orderNrValue : '';
+            if ($orderNrValue) {
+                $query .= " and ($oxOrderNr like $orderNrValue or $oxUnzerOrderNr like $orderNrValue) ";
+            }
         }
 
         return $query;
@@ -71,7 +74,7 @@ protected function prepareWhereQuery($whereQuery, $fullQuery)
      */
     protected function prepareOrderListQuery(array $whereQuery, string $filterQuery): string
     {
-        if (is_array($whereQuery) && count($whereQuery)) {
+        if (count($whereQuery)) {
             $myUtilsString = Registry::getUtilsString();
             foreach ($whereQuery as $identifierName => $fieldValue) {
                 //passing oxunzerordernr because it will be combined with oxordernr
@@ -96,10 +99,15 @@ protected function prepareOrderListQuery(array $whereQuery, string $filterQuery)
                         $orderNrQuery = [];
                         foreach ($values as $value) {
                             $value = $connectionProvider->quote($value);
-                            $orderNrQuery[] = "($oxOrderNr like $value"
-                                . " or $oxUnzerOrderNr like $value)";
+                            $value = is_string($value) ? $value : '';
+                            if ($value) {
+                                $orderNrQuery[] = "($oxOrderNr like $value"
+                                    . " or $oxUnzerOrderNr like $value)";
+                            }
+                        }
+                        if ($orderNrQuery) {
+                            $filterQuery .= "and (" . implode(" or ", $orderNrQuery) . ")";
                         }
-                        $filterQuery .= "and (" . implode(" or ", $orderNrQuery) . ")";
 
                         continue;
                     }

diff --git a/src/Service/Transaction.php b/src/Service/Transaction.php
@@ -382,16 +382,15 @@ protected function getNewTransactionObject(): TransactionModel
 
     /**
      * @param string $paymentid
-     * @return array|false
+     * @return array|null
      * @throws Exception
      * @throws \Doctrine\DBAL\Exception
      */
     public function getTransactionDataByPaymentId(string $paymentid): ?array
     {
-        $result = false;
+        $result = null;
 
         if ($paymentid) {
-
             $queryBuilderFactory = $this->getServiceFromContainer(QueryBuilderFactoryInterface::class);
             $queryBuilder = $queryBuilderFactory->create();
 
@@ -475,6 +474,7 @@ public function getPaymentIdByOrderId(string $orderid, bool $withoutCancel = fal
         $queryResult = $query->setParameters($parameters)->execute();
         if ($queryResult instanceof ResultStatement && $queryResult->columnCount()) {
             $result = $queryResult->fetchOne();
+            $result = is_string($result) ? $result : '';
         }
 
         return $result;
@@ -511,6 +511,7 @@ public function getTransactionIdByOrderId(string $orderid): string
         $queryResult = $query->setParameters($parameters)->execute();
         if ($queryResult instanceof ResultStatement && $queryResult->columnCount()) {
             $result = $queryResult->fetchOne();
+            $result = is_string($result) ? $result : '';
         }
 
         return $result;

diff --git a/src/Service/UnzerSDKLoader.php b/src/Service/UnzerSDKLoader.php
@@ -117,6 +117,7 @@ public function getUnzerSDKbyKey(string $key): Unzer
      * @throws UnzerException
      * @throws Exception|\Doctrine\DBAL\Exception
      * @SuppressWarnings(PHPMD.StaticAccess)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getUnzerSDKbyPaymentType(string $sPaymentId): Unzer
     {
@@ -150,8 +151,8 @@ public function getUnzerSDKbyPaymentType(string $sPaymentId): Unzer
         $currency = '';
         $paymentId = '';
         if ($row) {
-            $currency = $row['currency'];
-            $paymentId = $row['oxpaymenttype'];
+            $currency = is_string($row['currency']) ? $row['currency'] : '';
+            $paymentId = is_string($row['oxpaymenttype']) ? $row['oxpaymenttype'] : '';
             if ($paymentId === UnzerDefinitions::INVOICE_UNZER_PAYMENT_ID) {
                 $customerType = 'B2C';
                 if (!empty($row['oxdelcompany']) || !empty($row['oxbillcompany'])) {