phpmyadmin
diff --git a/‎phpstan-baseline.neon‎
Lines changed: 1 addition & 1 deletion b/‎phpstan-baseline.neon‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎psalm-baseline.xml‎
Lines changed: 1 addition & 6 deletions b/‎psalm-baseline.xml‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎src/Table/Search.php‎
Lines changed: 13 additions & 18 deletions b/‎src/Table/Search.php‎
Lines changed: 13 additions & 18 deletions
@@ -18816,7 +18816,7 @@ parameters:
 			path: src/Table/Search.php
 
 		-
-			message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:escapeString\\(\\) expects string, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:quoteString\\(\\) expects string, mixed given\\.$#"
 			count: 3
 			path: src/Table/Search.php
 
 
@@ -12307,12 +12307,6 @@
     </PossiblyUndefinedArrayOffset>
   </file>
   <file src="src/Table/Search.php">
-    <DeprecatedMethod>
-      <code>escapeString</code>
-      <code>escapeString</code>
-      <code>escapeString</code>
-      <code>escapeString</code>
-    </DeprecatedMethod>
     <MixedArgument>
       <code><![CDATA[$_POST['criteriaColumnNames'][$columnIndex]]]></code>
       <code><![CDATA[$_POST['criteriaColumnTypes'][$columnIndex]]]></code>
@@ -12342,6 +12336,7 @@
       <code>$criteriaValues</code>
       <code>$criteriaValues</code>
       <code>$criteriaValues</code>
+      <code><![CDATA[$needsQuoting ? $this->dbi->quoteString($criteriaValues) : $criteriaValues]]></code>
       <code><![CDATA[$values[0] ?? '']]></code>
       <code><![CDATA[$values[1] ?? '']]></code>
     </MixedOperand>
 
@@ -162,14 +162,8 @@ private function getWhereClause(
             // (like INT), for a LIKE we always quote the value. MySQL converts
             // strings to numbers and numbers to strings as necessary
             // during the comparison
-            if (
-                preg_match('@char|binary|blob|text|set|date|time|year|uuid@i', $types)
-                || mb_strpos(' ' . $funcType, 'LIKE')
-            ) {
-                $quot = '\'';
-            } else {
-                $quot = '';
-            }
+            $needsQuoting = preg_match('@char|binary|blob|text|set|date|time|year|uuid@i', $types)
+                || mb_strpos(' ' . $funcType, 'LIKE');
 
             // LIKE %...%
             if ($funcType === 'LIKE %...%') {
@@ -193,8 +187,8 @@ private function getWhereClause(
                 && $funcType !== 'BETWEEN'
                 && $funcType !== 'NOT BETWEEN'
             ) {
-                return $backquotedName . ' ' . $funcType . ' ' . $quot
-                    . $this->dbi->escapeString($criteriaValues) . $quot;
+                return $backquotedName . ' ' . $funcType . ' '
+                    . ($needsQuoting ? $this->dbi->quoteString($criteriaValues) : $criteriaValues);
             }
 
             $funcType = str_replace(' (...)', '', $funcType);
@@ -209,15 +203,18 @@ private function getWhereClause(
 
             // quote values one by one
             $emptyKey = false;
-            foreach ($values as $key => &$value) {
+            foreach ($values as $key => $value) {
                 if ($value === '') {
                     $emptyKey = $key;
-                    $value = 'NULL';
+                    $values[$key] = 'NULL';
+                    continue;
+                }
+
+                if (! $needsQuoting) {
                     continue;
                 }
 
-                $value = $quot . $this->dbi->escapeString(trim($value))
-                    . $quot;
+                $values[$key] = $this->dbi->quoteString(trim($value));
             }
 
             if ($funcType === 'BETWEEN' || $funcType === 'NOT BETWEEN') {
@@ -334,11 +331,9 @@ private function getEnumWhereClause(mixed $criteriaValues, string $funcType): st
             $parensClose = '';
         }
 
-        $enumWhere = '\''
-            . $this->dbi->escapeString($criteriaValues[0]) . '\'';
+        $enumWhere = $this->dbi->quoteString($criteriaValues[0]);
         for ($e = 1; $e < $enumSelectedCount; $e++) {
-            $enumWhere .= ', \''
-                . $this->dbi->escapeString($criteriaValues[$e]) . '\'';
+            $enumWhere .= ', ' . $this->dbi->quoteString($criteriaValues[$e]);
         }
 
         return ' ' . $funcType . ' ' . $parensOpen
Original file line number	Diff line number	Diff line change
`@@ -18816,7 +18816,7 @@ parameters:`
`18816`	`18816`	`path: src/Table/Search.php`
`18817`	`18817`
`18818`	`18818`	`-`
`18819`		`- message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:escapeString\\(\\) expects string, mixed given\\.$#"`
	`18819`	`+ message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:quoteString\\(\\) expects string, mixed given\\.$#"`
`18820`	`18820`	`count: 3`
`18821`	`18821`	`path: src/Table/Search.php`
`18822`	`18822`