Changeset 47550 for trunk/src/wp-includes/pluggable.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/pluggable.php (modified) (4 diffs)

trunk/src/wp-includes/pluggable.php

@@ -455 +455 @@
             foreach ( (array) $headers as $name => $content ) {
                 // Only add custom headers not added automatically by PHPMailer.
-                if ( ! in_array( $name, array( 'MIME-Version', 'X-Mailer' ) ) ) {
+                if ( ! in_array( $name, array( 'MIME-Version', 'X-Mailer' ), true ) ) {
                     $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
                 }
@@ -547 +547 @@
         $ignore_codes = array( 'empty_username', 'empty_password' );
 
-        if ( is_wp_error( $user ) && ! in_array( $user->get_error_code(), $ignore_codes ) ) {
+        if ( is_wp_error( $user ) && ! in_array( $user->get_error_code(), $ignore_codes, true ) ) {
             $error = $user;
 
@@ -1466 +1466 @@
         $allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array( $wpp['host'] ), isset( $lp['host'] ) ? $lp['host'] : '' );
 
-        if ( isset( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts ) && strtolower( $wpp['host'] ) !== $lp['host'] ) ) {
+        if ( isset( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts, true ) && strtolower( $wpp['host'] ) !== $lp['host'] ) ) {
             $location = $default;
         }
@@ -2272 +2272 @@
         }
 
-        if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) {
+        if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ), true ) ) {
             foreach ( array( 'key', 'salt' ) as $type ) {
                 $const = strtoupper( "{$scheme}_{$type}" );