Use quoteString in Util

kamil-tekiela · MauricioFauth · commit 31800be779b7 · 2023-03-03T17:36:34.000-03:00
Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
@@ -825,8 +825,7 @@ private static function getConditionValue(
             $conditionValue = "= b'"
                 . self::printableBitValue((int) $row, $meta->length) . "'";
         } else {
-            $conditionValue = '= \''
-                . $GLOBALS['dbi']->escapeString((string) $row) . '\'';
+            $conditionValue = '= ' . $GLOBALS['dbi']->quoteString((string) $row);
         }
 
         return [$conditionValue, $condition];
@@ -1711,14 +1710,14 @@ public static function currentUserHasPrivilege(string $priv, string|null $db = n
             return false;
         }
 
-        $query .= " AND '%s' LIKE `TABLE_SCHEMA`";
+        $query .= ' AND %s LIKE `TABLE_SCHEMA`';
         $schemaPrivileges = $GLOBALS['dbi']->fetchValue(
             sprintf(
                 $query,
                 'SCHEMA_PRIVILEGES',
                 $username,
                 $priv,
-                $GLOBALS['dbi']->escapeString($db),
+                $GLOBALS['dbi']->quoteString($db),
             ),
         );
         if ($schemaPrivileges) {
@@ -1728,15 +1727,15 @@ public static function currentUserHasPrivilege(string $priv, string|null $db = n
         // If a table name was also provided and we still didn't
         // find any valid privileges, try table-wise privileges.
         if ($tbl !== null) {
-            $query .= " AND TABLE_NAME='%s'";
+            $query .= ' AND TABLE_NAME=%s';
             $tablePrivileges = $GLOBALS['dbi']->fetchValue(
                 sprintf(
                     $query,
                     'TABLE_PRIVILEGES',
                     $username,
                     $priv,
-                    $GLOBALS['dbi']->escapeString($db),
-                    $GLOBALS['dbi']->escapeString($tbl),
+                    $GLOBALS['dbi']->quoteString($db),
+                    $GLOBALS['dbi']->quoteString($tbl),
                 ),
             );
             if ($tablePrivileges) {
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -14707,12 +14707,6 @@
     <ArgumentTypeCoercion>
       <code>$separator</code>
     </ArgumentTypeCoercion>
-    <DeprecatedMethod>
-      <code>escapeString</code>
-      <code>escapeString</code>
-      <code>escapeString</code>
-      <code>escapeString</code>
-    </DeprecatedMethod>
     <InvalidArrayOffset>
       <code><![CDATA[$GLOBALS['cfg']['SkipLockedTables']]]></code>
       <code>$byteUnits[$d]</code>
