Changeset 47550 for trunk/src/wp-includes/formatting.php

Timestamp:

04/05/2020 03:00:44 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search() where strings are involved.

This reduces the number of WordPress.PHP.StrictInArray.MissingTrueStrict issues from 486 to 50.

Includes minor code layout fixes for better readability.

See #49542.

File:

• trunk/src/wp-includes/formatting.php (modified) (9 diffs)

trunk/src/wp-includes/formatting.php

@@ -425 +425 @@
 
     // Handle disabled tags.
-    if ( in_array( $tag, $disabled_elements ) ) {
+    if ( in_array( $tag, $disabled_elements, true ) ) {
         if ( $opening_tag ) {
             /*
@@ -979 +979 @@
     }
 
-    if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
+    if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ), true ) ) {
         $charset = 'UTF-8';
     }
@@ -1124 +1124 @@
     static $is_utf8 = null;
     if ( ! isset( $is_utf8 ) ) {
-        $is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) );
+        $is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true );
     }
     if ( ! $is_utf8 ) {
@@ -2877 +2877 @@
 
     // Removed trailing [.,;:)] from URL.
-    if ( in_array( substr( $dest, -1 ), array( '.', ',', ';', ':', ')' ) ) === true ) {
-        $ret  = substr( $dest, -1 );
+    $last_char = substr( $dest, -1 );
+    if ( in_array( $last_char, array( '.', ',', ';', ':', ')' ), true ) === true ) {
+        $ret  = $last_char;
         $dest = substr( $dest, 0, strlen( $dest ) - 1 );
     }
@@ -3306 +3307 @@
 
     // Don't convert smilies that aren't images - they're probably emoji.
-    if ( ! in_array( $ext, $image_exts ) ) {
+    if ( ! in_array( $ext, $image_exts, true ) ) {
         return $img;
     }
@@ -4312 +4313 @@
      * starting with /, # or ?, or a PHP file).
      */
-    if ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
+    if ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ), true ) &&
         ! preg_match( '/^[a-z0-9-]+?\.php/i', $url ) ) {
         $url = 'http://' . $url;
@@ -4716 +4717 @@
                 $allowed[] = WPLANG;
             }
-            if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) {
+            if ( ! in_array( $value, $allowed, true ) && ! empty( $value ) ) {
                 $value = get_option( $option );
             }
@@ -4764 +4765 @@
         case 'timezone_string':
             $allowed_zones = timezone_identifiers_list();
-            if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
+            if ( ! in_array( $value, $allowed_zones, true ) && ! empty( $value ) ) {
                 $error = __( 'The timezone you have entered is not valid. Please select a valid timezone.' );
             }
@@ -5146 +5147 @@
     // 1 = attribute name  2 = quotation mark  3 = URL.
     return $m[1] . '=' . $m[2] .
-        ( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
+        ( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols(), true ) ?
             $m[3] :
             WP_Http::make_absolute_url( $m[3], $_links_add_base )