<!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>[55090] trunk/tests/phpunit/tests/kses.php: Code Modernization: Rename parameters that use reserved keywords in `phpunit/tests/kses.php`.</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/55090">55090</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/55090","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>2023-01-18 16:17:41 +0000 (Wed, 18 Jan 2023)</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'>Code Modernization: Rename parameters that use reserved keywords in `phpunit/tests/kses.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit:
* Renames the `$string` parameter to `$content` in:
* `Tests_Kses::test_wp_filter_post_kses_address()`
* `Tests_Kses::test_wp_filter_post_kses_a()`
* `Tests_Kses::test_wp_filter_post_kses_abbr()`
* Amends a few parameters and variables in other tests in the same file for consistency.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52946">[52946]</a>, <a href="https://core.trac.wordpress.org/changeset/52996">[52996]</a>, <a href="https://core.trac.wordpress.org/changeset/52997">[52997]</a>, <a href="https://core.trac.wordpress.org/changeset/52998">[52998]</a>, <a href="https://core.trac.wordpress.org/changeset/53003">[53003]</a>, <a href="https://core.trac.wordpress.org/changeset/53014">[53014]</a>, <a href="https://core.trac.wordpress.org/changeset/53029">[53029]</a>, <a href="https://core.trac.wordpress.org/changeset/53039">[53039]</a>, <a href="https://core.trac.wordpress.org/changeset/53116">[53116]</a>, <a href="https://core.trac.wordpress.org/changeset/53117">[53117]</a>, <a href="https://core.trac.wordpress.org/changeset/53137">[53137]</a>, <a href="https://core.trac.wordpress.org/changeset/53174">[53174]</a>, <a href="https://core.trac.wordpress.org/changeset/53184">[53184]</a>, <a href="https://core.trac.wordpress.org/changeset/53185">[531
85]</a>, <a href="https://core.trac.wordpress.org/changeset/53192">[53192]</a>, <a href="https://core.trac.wordpress.org/changeset/53193">[53193]</a>, <a href="https://core.trac.wordpress.org/changeset/53198">[53198]</a>, <a href="https://core.trac.wordpress.org/changeset/53203">[53203]</a>, <a href="https://core.trac.wordpress.org/changeset/53207">[53207]</a>, <a href="https://core.trac.wordpress.org/changeset/53215">[53215]</a>, <a href="https://core.trac.wordpress.org/changeset/53216">[53216]</a>, <a href="https://core.trac.wordpress.org/changeset/53220">[53220]</a>, <a href="https://core.trac.wordpress.org/changeset/53230">[53230]</a>, <a href="https://core.trac.wordpress.org/changeset/53232">[53232]</a>, <a href="https://core.trac.wordpress.org/changeset/53236">[53236]</a>, <a href="https://core.trac.wordpress.org/changeset/53239">[53239]</a>, <a href="https://core.trac.wordpress.org/changeset/53240">[53240]</a>, <a href="https://core.trac.wordpress.org/changeset/53242">[53242]
</a>, <a href="https://core.trac.wordpress.org/changeset/53243">[53243]</a>, <a href="https://core.trac.wordpress.org/changeset/53245">[53245]</a>, <a href="https://core.trac.wordpress.org/changeset/53246">[53246]</a>, <a href="https://core.trac.wordpress.org/changeset/53257">[53257]</a>, <a href="https://core.trac.wordpress.org/changeset/53269">[53269]</a>, <a href="https://core.trac.wordpress.org/changeset/53270">[53270]</a>, <a href="https://core.trac.wordpress.org/changeset/53271">[53271]</a>, <a href="https://core.trac.wordpress.org/changeset/53272">[53272]</a>, <a href="https://core.trac.wordpress.org/changeset/53273">[53273]</a>, <a href="https://core.trac.wordpress.org/changeset/53274">[53274]</a>, <a href="https://core.trac.wordpress.org/changeset/53275">[53275]</a>, <a href="https://core.trac.wordpress.org/changeset/53276">[53276]</a>, <a href="https://core.trac.wordpress.org/changeset/53277">[53277]</a>, <a href="https://core.trac.wordpress.org/changeset/53281">[53281]</a
>, <a href="https://core.trac.wordpress.org/changeset/53283">[53283]</a>, <a href="https://core.trac.wordpress.org/changeset/53284">[53284]</a>, <a href="https://core.trac.wordpress.org/changeset/53285">[53285]</a>, <a href="https://core.trac.wordpress.org/changeset/53287">[53287]</a>, <a href="https://core.trac.wordpress.org/changeset/53364">[53364]</a>, <a href="https://core.trac.wordpress.org/changeset/53365">[53365]</a>, <a href="https://core.trac.wordpress.org/changeset/54927">[54927]</a>, <a href="https://core.trac.wordpress.org/changeset/54929">[54929]</a>, <a href="https://core.trac.wordpress.org/changeset/54930">[54930]</a>, <a href="https://core.trac.wordpress.org/changeset/54931">[54931]</a>, <a href="https://core.trac.wordpress.org/changeset/54932">[54932]</a>, <a href="https://core.trac.wordpress.org/changeset/54933">[54933]</a>, <a href="https://core.trac.wordpress.org/changeset/54938">[54938]</a>, <a href="https://core.trac.wordpress.org/changeset/54943">[54943]</a>,
<a href="https://core.trac.wordpress.org/changeset/54944">[54944]</a>, <a href="https://core.trac.wordpress.org/changeset/54945">[54945]</a>, <a href="https://core.trac.wordpress.org/changeset/54946">[54946]</a>, <a href="https://core.trac.wordpress.org/changeset/54947">[54947]</a>, <a href="https://core.trac.wordpress.org/changeset/54948">[54948]</a>, <a href="https://core.trac.wordpress.org/changeset/54950">[54950]</a>, <a href="https://core.trac.wordpress.org/changeset/54951">[54951]</a>, <a href="https://core.trac.wordpress.org/changeset/54952">[54952]</a>, <a href="https://core.trac.wordpress.org/changeset/54956">[54956]</a>, <a href="https://core.trac.wordpress.org/changeset/54959">[54959]</a>, <a href="https://core.trac.wordpress.org/changeset/54960">[54960]</a>, <a href="https://core.trac.wordpress.org/changeset/54961">[54961]</a>, <a href="https://core.trac.wordpress.org/changeset/54962">[54962]</a>, <a href="https://core.trac.wordpress.org/changeset/54964">[54964]</a>, <a
href="https://core.trac.wordpress.org/changeset/54965">[54965]</a>, <a href="https://core.trac.wordpress.org/changeset/54969">[54969]</a>, <a href="https://core.trac.wordpress.org/changeset/54970">[54970]</a>, <a href="https://core.trac.wordpress.org/changeset/54971">[54971]</a>, <a href="https://core.trac.wordpress.org/changeset/54972">[54972]</a>, <a href="https://core.trac.wordpress.org/changeset/54996">[54996]</a>, <a href="https://core.trac.wordpress.org/changeset/55000">[55000]</a>, <a href="https://core.trac.wordpress.org/changeset/55011">[55011]</a>, <a href="https://core.trac.wordpress.org/changeset/55013">[55013]</a>, <a href="https://core.trac.wordpress.org/changeset/55014">[55014]</a>, <a href="https://core.trac.wordpress.org/changeset/55015">[55015]</a>, <a href="https://core.trac.wordpress.org/changeset/55016">[55016]</a>, <a href="https://core.trac.wordpress.org/changeset/55017">[55017]</a>, <a href="https://core.trac.wordpress.org/changeset/55020">[55020]</a>, <a hre
f="https://core.trac.wordpress.org/changeset/55021">[55021]</a>, <a href="https://core.trac.wordpress.org/changeset/55023">[55023]</a>, <a href="https://core.trac.wordpress.org/changeset/55027">[55027]</a>, <a href="https://core.trac.wordpress.org/changeset/55028">[55028]</a>, <a href="https://core.trac.wordpress.org/changeset/55034">[55034]</a>, <a href="https://core.trac.wordpress.org/changeset/55036">[55036]</a>, <a href="https://core.trac.wordpress.org/changeset/55037">[55037]</a>, <a href="https://core.trac.wordpress.org/changeset/55038">[55038]</a>, <a href="https://core.trac.wordpress.org/changeset/55039">[55039]</a>, <a href="https://core.trac.wordpress.org/changeset/55049">[55049]</a>, <a href="https://core.trac.wordpress.org/changeset/55050">[55050]</a>, <a href="https://core.trac.wordpress.org/changeset/55060">[55060]</a>, <a href="https://core.trac.wordpress.org/changeset/55062">[55062]</a>, <a href="https://core.trac.wordpress.org/changeset/55064">[55064]</a>, <a href="
https://core.trac.wordpress.org/changeset/55065">[55065]</a>, <a href="https://core.trac.wordpress.org/changeset/55076">[55076]</a>, <a href="https://core.trac.wordpress.org/changeset/55077">[55077]</a>, <a href="https://core.trac.wordpress.org/changeset/55078">[55078]</a>, <a href="https://core.trac.wordpress.org/changeset/55081">[55081]</a>.
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/56788">#56788</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsksesphp">trunk/tests/phpunit/tests/kses.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsksesphp"></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/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/kses.php 2023-01-18 14:50:29 UTC (rev 55089)
+++ trunk/tests/phpunit/tests/kses.php 2023-01-18 16:17:41 UTC (rev 55090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,13 +11,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_filter_post_kses_address
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20210
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string Test string for kses.
- * @param string $expect_string Expected result after passing through kses.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content Test string for kses.
+ * @param string $expected Expected result after passing through kses.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_filter_post_kses_address( $string, $expect_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_post_kses_address( $content, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +24,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Data provider for test_wp_filter_post_kses_address.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array[] Arguments {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $string Test string for kses.
- * @type string $expect_string Expected result after passing through kses.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $content Test string for kses.
+ * @type string $expected Expected result after passing through kses.
</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"> public function data_wp_filter_post_kses_address() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,10 +45,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $attributes as $name => $values ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $values as $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $string = "<address $name='$value'>1 WordPress Avenue, The Internet.</address>";
- $expect_string = "<address $name='" . str_replace( '; ', ';', trim( $value, ';' ) ) . "'>1 WordPress Avenue, The Internet.</address>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = "<address $name='$value'>1 WordPress Avenue, The Internet.</address>";
+ $expected = "<address $name='" . str_replace( '; ', ';', trim( $value, ';' ) ) . "'>1 WordPress Avenue, The Internet.</address>";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data[] = array( $string, $expect_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data[] = array( $content, $expected );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,13 +59,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_filter_post_kses_a
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20210
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string Test string for kses.
- * @param string $expect_string Expected result after passing through kses.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content Test string for kses.
+ * @param string $expected Expected result after passing through kses.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_filter_post_kses_a( $string, $expect_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_post_kses_a( $content, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,8 +72,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Data provider for test_wp_filter_post_kses_a.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array[] Arguments {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $string Test string for kses.
- * @type string $expect_string Expected result after passing through kses.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $content Test string for kses.
+ * @type string $expected Expected result after passing through kses.
</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"> public function data_wp_filter_post_kses_a() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,9 +100,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attr = $name;
</span><span class="cx" style="display: block; padding: 0 10px"> $expected_attr = $name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $string = "<a $attr>I link this</a>";
- $expect_string = "<a $expected_attr>I link this</a>";
- $data[] = array( $string, $expect_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = "<a $attr>I link this</a>";
+ $expected = "<a $expected_attr>I link this</a>";
+ $data[] = array( $content, $expected );
</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"> return $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,8 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected Expected output following KSES parsing.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_kses_video( $source, $context, $expected ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = wp_kses( $source, $context );
- $this->assertSame( $expected, $actual );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, wp_kses( $source, $context ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,13 +165,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_filter_post_kses_abbr
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20210
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $string Test string for kses.
- * @param string $expect_string Expected result after passing through kses.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content Test string for kses.
+ * @param string $expected Expected result after passing through kses.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_filter_post_kses_abbr( $string, $expect_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_filter_post_kses_abbr( $content, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,8 +178,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Data provider for data_wp_filter_post_kses_abbr.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array[] Arguments {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $string Test string for kses.
- * @type string $expect_string Expected result after passing through kses.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $content Test string for kses.
+ * @type string $expected Expected result after passing through kses.
</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"> public function data_wp_filter_post_kses_abbr() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,9 +193,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $attributes as $name => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $string = "<abbr $name='$value'>WP</abbr>";
- $expect_string = "<abbr $name='" . trim( $value, ';' ) . "'>WP</abbr>";
- $data[] = array( $string, $expect_string );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = "<abbr $name='$value'>WP</abbr>";
+ $expected = "<abbr $name='" . trim( $value, ';' ) . "'>WP</abbr>";
+ $data[] = array( $content, $expected );
</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"> return $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,17 +534,18 @@
</span><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"> public function test_hyphenated_tag() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $string = '<hyphenated-tag attribute="value" otherattribute="value2">Alot of hyphens.</hyphenated-tag>';
- $custom_tags = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '<hyphenated-tag attribute="value" otherattribute="value2">Alot of hyphens.</hyphenated-tag>';
+ $custom_tags = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hyphenated-tag' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attribute' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expect_stripped_string = 'Alot of hyphens.';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expect_valid_string = '<hyphenated-tag attribute="value">Alot of hyphens.</hyphenated-tag>';
- $this->assertSame( $expect_stripped_string, wp_kses_post( $string ) );
- $this->assertSame( $expect_valid_string, wp_kses( $string, $custom_tags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expect_stripped_content = 'Alot of hyphens.';
+ $expect_valid_content = '<hyphenated-tag attribute="value">Alot of hyphens.</hyphenated-tag>';
+
+ $this->assertSame( $expect_stripped_content, wp_kses_post( $content ) );
+ $this->assertSame( $expect_valid_content, wp_kses( $content, $custom_tags ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -569,10 +569,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28506
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_ctrl_removal
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_ctrl_removal( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_ctrl_removal( $content, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->assertSame( $output, wp_kses( $input, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
</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"> public function data_ctrl_removal() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,10 +606,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28699
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_slash_zero_removal
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_slash_zero_removal( $input, $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_slash_zero_removal( $content, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->assertSame( $output, wp_kses( $input, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
</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"> public function data_slash_zero_removal() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,9 +862,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_bdo_tag_allowed() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $input = '<p>This is <bdo dir="rtl">a BDO tag</bdo>. Weird, <bdo dir="ltr">right?</bdo></p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '<p>This is <bdo dir="rtl">a BDO tag</bdo>. Weird, <bdo dir="ltr">right?</bdo></p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $input, wp_kses( $input, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $content, wp_kses( $content, $allowedposttags ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,9 +873,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_ruby_tag_allowed() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $input = '<ruby>✶<rp>: </rp><rt>Star</rt><rp>, </rp><rt lang="fr">Étoile</rt><rp>.</rp></ruby>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '<ruby>✶<rp>: </rp><rt>Star</rt><rp>, </rp><rt lang="fr">Étoile</rt><rp>.</rp></ruby>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $input, wp_kses( $input, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $content, wp_kses( $content, $allowedposttags ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -884,9 +884,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_ol_reversed_attribute_allowed() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $allowedposttags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $input = '<ol reversed="reversed"><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '<ol reversed="reversed"><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $input, wp_kses( $input, $allowedposttags ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $content, wp_kses( $content, $allowedposttags ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1306,10 +1306,10 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $string = '<div datamelformed-prefix="gone" data="gone" data-="gone" onclick="alert(1)">Malformed attributes</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '<div datamelformed-prefix="gone" data="gone" data-="gone" onclick="alert(1)">Malformed attributes</div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = '<div>Malformed attributes</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = wp_kses( $string, $allowed_html );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = wp_kses( $content, $allowed_html );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1326,10 +1326,10 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $string = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = wp_kses( $string, $allowed_html );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = wp_kses( $content, $allowed_html );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1844,12 +1844,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_kses_allowed_values_list
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $html A string of HTML to test.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content A string of HTML to test.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected The expected result from KSES.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $allowed_html The allowed HTML to pass to KSES.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_kses_allowed_values_list( $html, $expected, $allowed_html ) {
- $this->assertSame( $expected, wp_kses( $html, $allowed_html ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_allowed_values_list( $content, $expected, $allowed_html ) {
+ $this->assertSame( $expected, wp_kses( $content, $allowed_html ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1902,12 +1902,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_wp_kses_required_attribute
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $html A string of HTML to test.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $content A string of HTML to test.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected The expected result from KSES.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $allowed_html The allowed HTML to pass to KSES.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_kses_required_attribute( $html, $expected, $allowed_html ) {
- $this->assertSame( $expected, wp_kses( $html, $allowed_html ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_kses_required_attribute( $content, $expected, $allowed_html ) {
+ $this->assertSame( $expected, wp_kses( $content, $allowed_html ) );
</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>