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

Timestamp:

04/05/2020 03:00:44 AM (6 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/functions.php (modified) (10 diffs)

trunk/src/wp-includes/functions.php

@@ -2735 +2735 @@
         $ext2type = wp_get_ext_types();
         foreach ( $ext2type as $type => $exts ) {
-                if ( in_array( $ext, $exts ) ) {
+                if ( in_array( $ext, $exts, true ) ) {
                         return $type;
                 }
@@ -2882 +2882 @@
                 if ( in_array( $real_mime, $nonspecific_types, true ) ) {
                         // File is a non-specific binary type. That's ok if it's a type that generally tends to be binary.
-                        if ( ! in_array( substr( $type, 0, strcspn( $type, '/' ) ), array( 'application', 'video', 'audio' ) ) ) {
+                        if ( ! in_array( substr( $type, 0, strcspn( $type, '/' ) ), array( 'application', 'video', 'audio' ), true ) ) {
                                 $type = false;
                                 $ext  = false;
@@ -2906 +2906 @@
                                         'text/tsv',
                                         'text/vtt',
-                                )
+                                ),
+                                true
                         )
                         ) {
@@ -2920 +2921 @@
                                         'text/plain',
                                         'application/rtf',
-                                )
+                                ),
+                                true
                         )
                         ) {
@@ -2942 +2944 @@
                 $allowed = get_allowed_mime_types();
 
-                if ( ! in_array( $type, $allowed ) ) {
+                if ( ! in_array( $type, $allowed, true ) ) {
                         $type = false;
                         $ext  = false;
@@ -5236 +5238 @@
         if ( function_exists( 'apache_get_modules' ) ) {
                 $mods = apache_get_modules();
-                if ( in_array( $mod, $mods ) ) {
+                if ( in_array( $mod, $mods, true ) ) {
                         return true;
                 }
@@ -5318 +5320 @@
 
         // Files not in the allowed file list are not allowed:
-        if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) ) {
+        if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files, true ) ) {
                 return 3;
         }
@@ -5729 +5731 @@
         foreach ( timezone_identifiers_list() as $zone ) {
                 $zone = explode( '/', $zone );
-                if ( ! in_array( $zone[0], $continents ) ) {
+                if ( ! in_array( $zone[0], $continents, true ) ) {
                         continue;
                 }
@@ -6317 +6319 @@
                         $caller[] = "{$call['class']}{$call['type']}{$call['function']}";
                 } else {
-                        if ( in_array( $call['function'], array( 'do_action', 'apply_filters', 'do_action_ref_array', 'apply_filters_ref_array' ) ) ) {
+                        if ( in_array( $call['function'], array( 'do_action', 'apply_filters', 'do_action_ref_array', 'apply_filters_ref_array' ), true ) ) {
                                 $caller[] = "{$call['function']}('{$call['args'][0]}')";
-                        } elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
+                        } elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ), true ) ) {
                                 $filename = isset( $call['args'][0] ) ? $call['args'][0] : '';
                                 $caller[] = $call['function'] . "('" . str_replace( $truncate_paths, '', wp_normalize_path( $filename ) ) . "')";
@@ -6448 +6450 @@
         $screen = get_current_screen();
         $hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
-        $show   = ! in_array( $screen->id, $hidden );
+        $show   = ! in_array( $screen->id, $hidden, true );
 
         /**