<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53577] trunk/tests/phpunit/tests/db.php: Tests: Remove multiple `$wpdb::placeholder_escape()` calls in `wpdb` tests.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53577">53577</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53577","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-06-25 14:43:27 +0000 (Sat, 25 Jun 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests: Remove multiple `$wpdb::placeholder_escape()` calls in `wpdb` tests.
This aims to improve performance of the tests by reducing the number of function calls.
Since `$wpdb::placeholder_escape()` saves the result in a static variable on the first run, there is no need for repeated function calls during the same request or test run, as the result would still be the same.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/42056">[42056]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db.php 2022-06-24 21:24:18 UTC (rev 53576)
+++ trunk/tests/phpunit/tests/db.php 2022-06-25 14:43:27 UTC (rev 53577)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,6 +424,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_prepare_incorrect_arg_count() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $placeholder_escape = $wpdb->placeholder_escape();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s", // Query.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,12 +445,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT * FROM $wpdb->users WHERE id = %d AND %% AND user_login = %s",
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1, 'admin', 'extra-arg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "SELECT * FROM $wpdb->users WHERE id = 1 AND {$wpdb->placeholder_escape()} AND user_login = 'admin'",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT * FROM $wpdb->users WHERE id = 1 AND {$placeholder_escape} AND user_login = 'admin'",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT * FROM $wpdb->users WHERE id = %%%d AND %F AND %f AND user_login = %s",
</span><span class="cx" style="display: block; padding: 0 10px"> array( 1, 2.3, '4.5', 'admin', 'extra-arg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "SELECT * FROM $wpdb->users WHERE id = {$wpdb->placeholder_escape()}1 AND 2.300000 AND 4.500000 AND user_login = 'admin'",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT * FROM $wpdb->users WHERE id = {$placeholder_escape}1 AND 2.300000 AND 4.500000 AND user_login = 'admin'",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT * FROM $wpdb->users WHERE id = %d AND user_login = %s",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1550,6 +1552,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_prepare_with_placeholders() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $placeholder_escape = $wpdb->placeholder_escape();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%5s', // SQL to prepare.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1561,7 +1565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$d %%% % %%1$d%% %%%1$d%%',
</span><span class="cx" style="display: block; padding: 0 10px"> 1,
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "1 {$wpdb->placeholder_escape()}{$wpdb->placeholder_escape()} {$wpdb->placeholder_escape()} {$wpdb->placeholder_escape()}1\$d{$wpdb->placeholder_escape()} {$wpdb->placeholder_escape()}1{$wpdb->placeholder_escape()}",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "1 {$placeholder_escape}{$placeholder_escape} {$placeholder_escape} {$placeholder_escape}1\$d{$placeholder_escape} {$placeholder_escape}1{$placeholder_escape}",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%-5s',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1603,25 +1607,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '%s',
</span><span class="cx" style="display: block; padding: 0 10px"> ' %s ',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "' {$wpdb->placeholder_escape()}s '",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "' {$placeholder_escape}s '",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s',
</span><span class="cx" style="display: block; padding: 0 10px"> ' %s ',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- " {$wpdb->placeholder_escape()}s ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ " {$placeholder_escape}s ",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%1$s',
</span><span class="cx" style="display: block; padding: 0 10px"> ' %1$s ',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- " {$wpdb->placeholder_escape()}1\$s ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ " {$placeholder_escape}1\$s ",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%d %1$d %%% %',
</span><span class="cx" style="display: block; padding: 0 10px"> 1,
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "1 1 {$wpdb->placeholder_escape()}{$wpdb->placeholder_escape()} {$wpdb->placeholder_escape()}",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "1 1 {$placeholder_escape}{$placeholder_escape} {$placeholder_escape}",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%d %2$s',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1663,25 +1667,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "%%s %%'%1\$s'",
</span><span class="cx" style="display: block; padding: 0 10px"> 'hello',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "{$wpdb->placeholder_escape()}s {$wpdb->placeholder_escape()}'hello'",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "{$placeholder_escape}s {$placeholder_escape}'hello'",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%%s %%"%1$s"',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hello',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "{$wpdb->placeholder_escape()}s {$wpdb->placeholder_escape()}\"hello\"",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "{$placeholder_escape}s {$placeholder_escape}\"hello\"",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%s',
</span><span class="cx" style="display: block; padding: 0 10px"> ' % s ',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "' {$wpdb->placeholder_escape()} s '",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "' {$placeholder_escape} s '",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%%f %%"%1$f"',
</span><span class="cx" style="display: block; padding: 0 10px"> 3,
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "{$wpdb->placeholder_escape()}f {$wpdb->placeholder_escape()}\"3.000000\"",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "{$placeholder_escape}f {$placeholder_escape}\"3.000000\"",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WHERE second=\'%2$s\' AND first=\'%1$s\'',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1699,19 +1703,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "'%'%%s",
</span><span class="cx" style="display: block; padding: 0 10px"> 'hello',
</span><span class="cx" style="display: block; padding: 0 10px"> true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "'{$wpdb->placeholder_escape()}'{$wpdb->placeholder_escape()}s",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "'{$placeholder_escape}'{$placeholder_escape}s",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "'%'%%s%s",
</span><span class="cx" style="display: block; padding: 0 10px"> 'hello',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "'{$wpdb->placeholder_escape()}'{$wpdb->placeholder_escape()}s'hello'",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "'{$placeholder_escape}'{$placeholder_escape}s'hello'",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "'%'%%s %s",
</span><span class="cx" style="display: block; padding: 0 10px"> 'hello',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "'{$wpdb->placeholder_escape()}'{$wpdb->placeholder_escape()}s 'hello'",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "'{$placeholder_escape}'{$placeholder_escape}s 'hello'",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "'%-'#5s' '%'#-+-5s'",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1759,7 +1763,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'WHERE %i = %d;',
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'evil_%s_field', 321 ),
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "WHERE `evil_{$wpdb->placeholder_escape()}s_field` = 321;",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "WHERE `evil_{$placeholder_escape}s_field` = 321;",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WHERE %i = %d;',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1864,6 +1868,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_escape_and_prepare() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $placeholder_escape = $wpdb->placeholder_escape();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '%s', // String to pass through esc_url().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1870,7 +1877,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ' {ESCAPE} ', // Query to insert the output of esc_url() into, replacing "{ESCAPE}".
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo', // Data to send to prepare().
</span><span class="cx" style="display: block; padding: 0 10px"> true, // Whether to expect an incorrect usage error or not.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- " {$wpdb->placeholder_escape()}s ", // Expected output.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ " {$placeholder_escape}s ", // Expected output.
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo%sbar',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1884,7 +1891,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ' %s {ESCAPE} ',
</span><span class="cx" style="display: block; padding: 0 10px"> 'foo',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- " 'foo' {$wpdb->placeholder_escape()}s ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ " 'foo' {$placeholder_escape}s ",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>