move logic to QueryFunction class

Author: cedric-anne

src/Glpi/Asset/CustomFieldType/DropdownType.php

@@ -40,8 +40,6 @@
 use Glpi\DBAL\QueryExpression;
 use Glpi\DBAL\QueryFunction;
 
-use function Safe\preg_match;
-
 class DropdownType extends AbstractType
 {
     public static function getName(): string
@@ -155,11 +153,10 @@ public function getSearchOption(): ?array
             ];
         } else {
             $opt['joinparams']['condition'] = [
-                QueryFunction::jsonContains([
+                QueryFunction::jsonContains(
                     'REFTABLE.custom_fields',
-                    preg_match('/-MariaDB/', $DB->getVersion()) ? 'NEWTABLE.id' : QueryFunction::cast('NEWTABLE.id', 'JSON'),
-                    new QueryExpression($DB::quoteValue('$."' . $this->custom_field->fields['id'] . '"')),
-                ]),
+                    'NEWTABLE.id'
+                ),
             ];
             $opt['forcegroupby'] = true;
             $opt['usehaving'] = true;

src/Glpi/DBAL/QueryFunction.php

@@ -55,7 +55,6 @@
  * @method static QueryExpression concat(array $params, ?string $alias = null) Build a 'CONCAT' SQL function call
  * @method static QueryExpression floor(string|QueryExpression $expression, ?string $alias = null) Build a 'FLOOR' function call
  * @method static QueryExpression greatest(array $params, ?string $alias = null) Build a 'GREATEST' function call
- * @method static QueryExpression jsonContains(array $params, ?string $alias = null) Build a 'JSON_CONTAINS' function call
  * @method static QueryExpression jsonExtract(array $params, ?string $alias = null) Build a 'JSON_EXTRACT' function call
  * @method static QueryExpression jsonUnquote(string|QueryExpression $expression, ?string $alias = null) Build a 'JSON_UNQUOTE' function call
  * @method static QueryExpression jsonRemove(array $params, ?string $alias = null) Build a 'JSON_REMOVE' function call
@@ -454,4 +453,24 @@ public static function concat_ws(string|QueryExpression $separator, array $param
         $separator = $separator instanceof QueryExpression ? $separator : $DB::quoteName($separator);
         return new QueryExpression('CONCAT_WS(' . $separator . ', ' . implode(', ', $params) . ')', $alias);
     }
+
+    public static function jsonContains(string|QueryExpression $target, string|QueryExpression $candidate, string $path, ?string $alias = null): QueryExpression
+    {
+        global $DB;
+
+        if (is_string($target)) {
+            $target = new QueryExpression($DB::quoteName($target));
+        }
+
+        if (is_string($candidate)) {
+            $candidate = preg_match('/-MariaDB/', $DB->getVersion())
+                ? new QueryExpression($DB::quoteName($candidate))
+                : QueryFunction::cast($candidate, 'JSON')
+            ;
+        }
+
+        $path = new QueryExpression($DB::quoteValue($path));
+
+        return self::getExpression('JSON_CONTAINS', [$target, $candidate, $path], $alias);
+    }
 }