Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Coding Standards: Use strict comparison in wp-includes/formatting.php.

Browse Source 
Follow-up to [1345], [4112], [6974], [24214], [25055], [28831], [32863].

Props aristath, poena, afercia, SergeyBiryukov.
See #58831.
Built from https://develop.svn.wordpress.org/trunk@56325


git-svn-id: http://core.svn.wordpress.org/trunk@55837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-07-30 08:53:25 +00:00
parent 18ca91327a
commit 8aa8b5883a
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wp-includes/formatting.php
View File

@ -354,7 +354,7 @@ function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quo
$sentence = preg_replace( $prime_pattern, $prime, $sentence ); $sentence = preg_replace( $prime_pattern, $prime, $sentence );
$sentence = preg_replace( $flag_after_digit, $prime, $sentence ); $sentence = preg_replace( $flag_after_digit, $prime, $sentence );
$sentence = str_replace( $flag, $close_quote, $sentence ); $sentence = str_replace( $flag, $close_quote, $sentence );
} elseif ( 1 == $count ) { } elseif ( 1 === $count ) {
// Found only one closing quote candidate, so give it priority over primes. // Found only one closing quote candidate, so give it priority over primes.
$sentence = str_replace( $flag, $close_quote, $sentence ); $sentence = str_replace( $flag, $close_quote, $sentence );
$sentence = preg_replace( $prime_pattern, $prime, $sentence ); $sentence = preg_replace( $prime_pattern, $prime, $sentence );
@ -422,7 +422,7 @@ function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
*/ */
array_push( $stack, $tag ); array_push( $stack, $tag );
} elseif ( end( $stack ) == $tag ) { } elseif ( end( $stack ) === $tag ) {
array_pop( $stack ); array_pop( $stack );
} }
} }
@ -884,29 +884,33 @@ function seems_utf8( $str ) {
mbstring_binary_safe_encoding(); mbstring_binary_safe_encoding();
$length = strlen( $str ); $length = strlen( $str );
reset_mbstring_encoding(); reset_mbstring_encoding();
for ( $i = 0; $i < $length; $i++ ) { for ( $i = 0; $i < $length; $i++ ) {
$c = ord( $str[ $i ] ); $c = ord( $str[ $i ] );
if ( $c < 0x80 ) { if ( $c < 0x80 ) {
$n = 0; // 0bbbbbbb $n = 0; // 0bbbbbbb
} elseif ( ( $c & 0xE0 ) == 0xC0 ) { } elseif ( ( $c & 0xE0 ) === 0xC0 ) {
$n = 1; // 110bbbbb $n = 1; // 110bbbbb
} elseif ( ( $c & 0xF0 ) == 0xE0 ) { } elseif ( ( $c & 0xF0 ) === 0xE0 ) {
$n = 2; // 1110bbbb $n = 2; // 1110bbbb
} elseif ( ( $c & 0xF8 ) == 0xF0 ) { } elseif ( ( $c & 0xF8 ) === 0xF0 ) {
$n = 3; // 11110bbb $n = 3; // 11110bbb
} elseif ( ( $c & 0xFC ) == 0xF8 ) { } elseif ( ( $c & 0xFC ) === 0xF8 ) {
$n = 4; // 111110bb $n = 4; // 111110bb
} elseif ( ( $c & 0xFE ) == 0xFC ) { } elseif ( ( $c & 0xFE ) === 0xFC ) {
$n = 5; // 1111110b $n = 5; // 1111110b
} else { } else {
return false; // Does not match any model. return false; // Does not match any model.
} }
for ( $j = 0; $j < $n; $j++ ) { // n bytes matching 10bbbbbb follow ? for ( $j = 0; $j < $n; $j++ ) { // n bytes matching 10bbbbbb follow ?
if ( ( ++$i === $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) != 0x80 ) ) { if ( ( ++$i === $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) !== 0x80 ) ) {
return false; return false;
} }
} }
} }
return true; return true;
} }
@ -2910,13 +2914,15 @@ function urldecode_deep( $value ) {
*/ */
function antispambot( $email_address, $hex_encoding = 0 ) { function antispambot( $email_address, $hex_encoding = 0 ) {
$email_no_spam_address = ''; $email_no_spam_address = '';
for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) { for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
$j = rand( 0, 1 + $hex_encoding ); $j = rand( 0, 1 + $hex_encoding );
if ( 0 == $j ) {
if ( 0 === $j ) {
$email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';'; $email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';';
} elseif ( 1 == $j ) { } elseif ( 1 === $j ) {
$email_no_spam_address .= $email_address[ $i ]; $email_no_spam_address .= $email_address[ $i ];
} elseif ( 2 == $j ) { } elseif ( 2 === $j ) {
$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[ $i ] ) ), 2 ); $email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[ $i ] ) ), 2 );
} }
} }
@ -4892,7 +4898,7 @@ function sanitize_option( $option, $value ) {
case 'default_ping_status': case 'default_ping_status':
case 'default_comment_status': case 'default_comment_status':
// Options that if not there have 0 value but need to be something like "closed". // Options that if not there have 0 value but need to be something like "closed".
if ( '0' == $value || '' === $value ) { if ( '0' === (string) $value || '' === $value ) {
$value = 'closed'; $value = 'closed';
} }
break; break;
@ -5230,6 +5236,7 @@ function wp_sprintf( $pattern, ...$args ) {
$start = 0; $start = 0;
$result = ''; $result = '';
$arg_index = 0; $arg_index = 0;
while ( $len > $start ) { while ( $len > $start ) {
// Last character: append and break. // Last character: append and break.
if ( strlen( $pattern ) - 1 === $start ) { if ( strlen( $pattern ) - 1 === $start ) {
@ -5274,7 +5281,8 @@ function wp_sprintf( $pattern, ...$args ) {
* @param string $arg The argument. * @param string $arg The argument.
*/ */
$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg ); $_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
if ( $_fragment != $fragment ) {
if ( $_fragment !== $fragment ) {
$fragment = $_fragment; $fragment = $_fragment;
} else { } else {
$fragment = sprintf( $fragment, (string) $arg ); $fragment = sprintf( $fragment, (string) $arg );
@ -5381,7 +5389,8 @@ function wp_html_excerpt( $str, $count, $more = null ) {
// Remove part of an entity at the end. // Remove part of an entity at the end.
$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt ); $excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
if ( $str != $excerpt ) {
if ( $str !== $excerpt ) {
$excerpt = trim( $excerpt ) . $more; $excerpt = trim( $excerpt ) . $more;
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.4-alpha-56324'; $wp_version = '6.4-alpha-56325';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.