Fix codesmell

Author: Kamshory, MT

src/Database/PicoDatabasePersistence.php

@@ -85,6 +85,9 @@ class PicoDatabasePersistence // NOSONAR
     const COMMA_RETURN = ", \r\n";
     const INLINE_TRIM = " \r\n\t ";
     const ALWAYS_TRUE = "(1=1)";
+    
+    const IS_NULL = " is null";
+    const CLAUSE_AND = " and ";
 
     /**
      * Database connection
@@ -929,7 +932,7 @@ private function getWhere($info, $queryBuilder)
             $value = $queryBuilder->escapeValue($value);
             if(strcasecmp($value, self::KEY_NULL) == 0)
             {
-                $wheres[] = $columnName . " is null";
+                $wheres[] = $columnName . self::IS_NULL;
             }
             else
             {
@@ -940,7 +943,7 @@ private function getWhere($info, $queryBuilder)
         {
             throw new NoPrimaryKeyDefinedException("No primary key defined");
         }
-        return implode(" and ", $wheres);
+        return implode(self::CLAUSE_AND, $wheres);
     }
 
     /**
@@ -977,7 +980,7 @@ private function getWhereWithColumns($info, $queryBuilder)
             $escapedValue = $queryBuilder->escapeValue($value);
             if(strcasecmp($escapedValue, self::KEY_NULL) == 0)
             {
-                $wheres[] = $columnName . " is null";
+                $wheres[] = $columnName . self::IS_NULL;
                 $columns[$columnName] = null;
             }
             else
@@ -992,7 +995,7 @@ private function getWhereWithColumns($info, $queryBuilder)
         }
 
         $result->columns = $columns;
-        $result->whereClause = implode(" and ", $wheres);
+        $result->whereClause = implode(self::CLAUSE_AND, $wheres);
         return $result;
     }
 
@@ -2150,14 +2153,14 @@ private function createWhereByPrimaryKeys($queryBuilder, $primaryKeys, $property
             $columnValue = $propertyValues[$index];
             if($columnValue === null)
             {
-                $wheres[] = $columnName . " is null";
+                $wheres[] = $columnName . self::IS_NULL;
             }
             else
             {
                 $wheres[] = $columnName . " = " . $queryBuilder->escapeValue($propertyValues[$index]);
             }
         }
-        $where = implode(" and ", $wheres);
+        $where = implode(self::CLAUSE_AND, $wheres);
         if(!$this->isValidFilter($where))
         {
             throw new InvalidFilterException(self::MESSAGE_INVALID_FILTER);

src/Database/PicoPageData.php

@@ -303,7 +303,7 @@ public function getResultAsArray()
      * @param mixed $data The data to convert. Can be a MagicObject, an array, an object, or a scalar value.
      * @return mixed The converted data as a plain PHP array, stdClass object, or scalar value.
      */
-    protected function magicObjectToArray($data)
+    protected function magicObjectToArray($data) // NOSONAR
     {
         // Null or scalar
         if (is_null($data) || is_scalar($data)) {