Changeset 56377

Timestamp:

08/09/2023 10:59:04 AM (14 months ago)

Author:

SergeyBiryukov

Message:

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

Follow-up to [649], [2896], [3418], [8386], [20540], [47219], [54933].

Props aristath, poena, afercia, SergeyBiryukov.
See #58831.

File:

• trunk/src/wp-includes/kses.php (modified) (12 diffs)

trunk/src/wp-includes/kses.php

@@ -1089 +1089 @@
     if ( str_starts_with( $content, '<!--' ) ) {
         $content = str_replace( array( '<!--', '-->' ), '', $content );
-        while ( ( $newstring = wp_kses( $content, $allowed_html, $allowed_protocols ) ) != $content ) {
+
+        while ( ( $newstring = wp_kses( $content, $allowed_html, $allowed_protocols ) ) !== $content ) {
             $content = $newstring;
         }
+
         if ( '' === $content ) {
             return '';
         }
+
         // Prevent multiple dashes in comments.
         $content = preg_replace( '/--+/', '-', $content );
         // Prevent three dashes closing a comment.
         $content = preg_replace( '/-$/', '', $content );
+
         return "<!--{$content}-->";
     }
@@ -1358 +1362 @@
                     $working = 1;
                     $mode    = 0;
+
                     if ( false === array_key_exists( $attrname, $attrarr ) ) {
                         $attrarr[ $attrname ] = array(
@@ -1366 +1371 @@
                         );
                     }
+
                     $attr = preg_replace( '/^\s+/', '', $attr );
                 }
@@ -1387 +1393 @@
                         );
                     }
+
                     $working = 1;
                     $mode    = 0;
@@ -1408 +1415 @@
                         );
                     }
+
                     $working = 1;
                     $mode    = 0;
@@ -1429 +1437 @@
                         );
                     }
+
                     // We add quotes to conform to W3C's HTML spec.
                     $working = 1;
@@ -1438 +1447 @@
         } // End switch.
 
-        if ( 0 == $working ) { // Not well-formed, remove and try again.
+        if ( 0 === $working ) { // Not well-formed, remove and try again.
             $attr = wp_kses_html_error( $attr );
             $mode = 0;
@@ -1444 +1453 @@
     } // End while.
 
-    if ( 1 == $mode && false === array_key_exists( $attrname, $attrarr ) ) {
+    if ( 1 === $mode && false === array_key_exists( $attrname, $attrarr ) ) {
         /*
          * Special case, for when the attribute list ends with a valueless
@@ -1708 +1717 @@
         $original_content = $content;
         $content          = wp_kses_bad_protocol_once( $content, $allowed_protocols );
-    } while ( $original_content != $content && ++$iterations < 6 );
-
-    if ( $original_content != $content ) {
+    } while ( $original_content !== $content && ++$iterations < 6 );
+
+    if ( $original_content !== $content ) {
         return '';
     }
@@ -1975 +1984 @@
 
     $i = $matches[1];
+
     if ( valid_unicode( $i ) ) {
         $i = str_pad( ltrim( $i, '0' ), 3, '0', STR_PAD_LEFT );
@@ -2004 +2014 @@
 
     $hexchars = $matches[1];
+
     return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x' . ltrim( $hexchars, '0' ) . ';';
 }
@@ -2016 +2027 @@
  */
 function valid_unicode( $i ) {
-    return ( 0x9 == $i || 0xa == $i || 0xd == $i ||
-            ( 0x20 <= $i && $i <= 0xd7ff ) ||
-            ( 0xe000 <= $i && $i <= 0xfffd ) ||
-            ( 0x10000 <= $i && $i <= 0x10ffff ) );
+    $i = (int) $i;
+
+    return ( 0x9 === $i || 0xa === $i || 0xd === $i ||
+        ( 0x20 <= $i && $i <= 0xd7ff ) ||
+        ( 0xe000 <= $i && $i <= 0xfffd ) ||
+        ( 0x10000 <= $i && $i <= 0x10ffff )
+    );
 }