Remove escapeString from Relation

kamil-tekiela · MauricioFauth · commit 98cfc6466767 · 2023-02-10T16:32:00.000-03:00
Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/libraries/classes/ConfigStorage/Relation.php b/libraries/classes/ConfigStorage/Relation.php
@@ -1055,13 +1055,16 @@ public function getForeignData(
                     . '.' . Util::backquote($foreign_table);
                 $f_query_filter = $foreign_filter === '' ? '' : ' WHERE '
                     . Util::backquote($foreign_field)
-                    . ' LIKE "%' . $this->dbi->escapeString($foreign_filter) . '%"'
+                    . ' LIKE ' . $this->dbi->quoteString(
+                        '%' . $this->dbi->escapeMysqlWildcards($foreign_filter) . '%'
+                    )
                     . (
                         $foreign_display === false
                         ? ''
                         : ' OR ' . Util::backquote($foreign_display)
-                        . ' LIKE "%' . $this->dbi->escapeString($foreign_filter)
-                        . '%"'
+                        . ' LIKE ' . $this->dbi->quoteString(
+                            '%' . $this->dbi->escapeMysqlWildcards($foreign_filter) . '%'
+                        )
                     );
                 $f_query_order = $foreign_display === false ? '' : ' ORDER BY '
                     . Util::backquote($foreign_table) . '.'
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -731,10 +731,6 @@
     </PossiblyInvalidCast>
   </file>
   <file src="libraries/classes/ConfigStorage/Relation.php">
-    <DeprecatedMethod occurrences="2">
-      <code>escapeString</code>
-      <code>escapeString</code>
-    </DeprecatedMethod>
     <InvalidArgument occurrences="1">
       <code>usort($tables, 'strnatcasecmp')</code>
     </InvalidArgument>
