<!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>[56325] trunk/src/wp-includes/formatting.php: Coding Standards: Use strict comparison in `wp-includes/formatting.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/56325">56325</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/56325","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-07-30 08:51:37 +0000 (Sun, 30 Jul 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'>Coding Standards: Use strict comparison in `wp-includes/formatting.php`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/1345">[1345]</a>, <a href="https://core.trac.wordpress.org/changeset/4112">[4112]</a>, <a href="https://core.trac.wordpress.org/changeset/6974">[6974]</a>, <a href="https://core.trac.wordpress.org/changeset/24214">[24214]</a>, <a href="https://core.trac.wordpress.org/changeset/25055">[25055]</a>, <a href="https://core.trac.wordpress.org/changeset/28831">[28831]</a>, <a href="https://core.trac.wordpress.org/changeset/32863">[32863]</a>.
Props aristath, poena, afercia, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/58831">#58831</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2023-07-29 00:29:29 UTC (rev 56324)
+++ trunk/src/wp-includes/formatting.php 2023-07-30 08:51:37 UTC (rev 56325)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $prime_pattern, $prime, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $flag_after_digit, $prime, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = str_replace( $flag, $close_quote, $sentence );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 1 == $count ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 === $count ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Found only one closing quote candidate, so give it priority over primes.
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = str_replace( $flag, $close_quote, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $prime_pattern, $prime, $sentence );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,7 @@
</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"> array_push( $stack, $tag );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( end( $stack ) == $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( end( $stack ) === $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> array_pop( $stack );
</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,29 +884,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mbstring_binary_safe_encoding();
</span><span class="cx" style="display: block; padding: 0 10px"> $length = strlen( $str );
</span><span class="cx" style="display: block; padding: 0 10px"> reset_mbstring_encoding();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < $length; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $c = ord( $str[ $i ] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $c < 0x80 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $n = 0; // 0bbbbbbb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( $c & 0xE0 ) == 0xC0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( $c & 0xE0 ) === 0xC0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = 1; // 110bbbbb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( $c & 0xF0 ) == 0xE0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( $c & 0xF0 ) === 0xE0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = 2; // 1110bbbb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( $c & 0xF8 ) == 0xF0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( $c & 0xF8 ) === 0xF0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = 3; // 11110bbb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( $c & 0xFC ) == 0xF8 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( $c & 0xFC ) === 0xF8 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = 4; // 111110bb
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( $c & 0xFE ) == 0xFC ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( $c & 0xFE ) === 0xFC ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = 5; // 1111110b
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return false; // Does not match any model.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $j = 0; $j < $n; $j++ ) { // n bytes matching 10bbbbbb follow ?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ++$i === $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) != 0x80 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ++$i === $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) !== 0x80 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">@@ -2910,13 +2914,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function antispambot( $email_address, $hex_encoding = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $j = rand( 0, 1 + $hex_encoding );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == $j ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 0 === $j ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 1 == $j ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 === $j ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address .= $email_address[ $i ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 2 == $j ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 2 === $j ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[ $i ] ) ), 2 );
</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">@@ -4892,7 +4898,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'default_ping_status':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'default_comment_status':
</span><span class="cx" style="display: block; padding: 0 10px"> // Options that if not there have 0 value but need to be something like "closed".
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '0' == $value || '' === $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' === (string) $value || '' === $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = 'closed';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5230,6 +5236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $start = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $arg_index = 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( $len > $start ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Last character: append and break.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen( $pattern ) - 1 === $start ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5274,7 +5281,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $arg The argument.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $_fragment != $fragment ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $_fragment !== $fragment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fragment = $_fragment;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $fragment = sprintf( $fragment, (string) $arg );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5381,7 +5389,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove part of an entity at the end.
</span><span class="cx" style="display: block; padding: 0 10px"> $excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $str != $excerpt ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $str !== $excerpt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $excerpt = trim( $excerpt ) . $more;
</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>