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

trunk/src/wp-admin/includes/upgrade.php

@@ -1914 +1914 @@
         if ( $wp_current_db_version < 29630 ) {
                 if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) {
-                        if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages() ) ) {
+                        if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages(), true ) ) {
                                 update_option( 'WPLANG', WPLANG );
                         } else {
@@ -2636 +2636 @@
         foreach ( $cqueries as $table => $qry ) {
                 // Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal.
-                if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) {
+                if ( in_array( $table, $global_tables, true ) && ! wp_should_upgrade_global_tables() ) {
                         unset( $cqueries[ $table ], $for_update[ $table ] );
                         continue;
@@ -2800 +2800 @@
                                 if ( $tablefield->Type != $fieldtype ) {
                                         $do_change = true;
-                                        if ( in_array( $fieldtype_lowercased, $text_fields ) && in_array( $tablefield_type_lowercased, $text_fields ) ) {
-                                                if ( array_search( $fieldtype_lowercased, $text_fields ) < array_search( $tablefield_type_lowercased, $text_fields ) ) {
+                                        if ( in_array( $fieldtype_lowercased, $text_fields, true ) && in_array( $tablefield_type_lowercased, $text_fields, true ) ) {
+                                                if ( array_search( $fieldtype_lowercased, $text_fields, true ) < array_search( $tablefield_type_lowercased, $text_fields, true ) ) {
                                                         $do_change = false;
                                                 }
                                         }
 
-                                        if ( in_array( $fieldtype_lowercased, $blob_fields ) && in_array( $tablefield_type_lowercased, $blob_fields ) ) {
-                                                if ( array_search( $fieldtype_lowercased, $blob_fields ) < array_search( $tablefield_type_lowercased, $blob_fields ) ) {
+                                        if ( in_array( $fieldtype_lowercased, $blob_fields, true ) && in_array( $tablefield_type_lowercased, $blob_fields, true ) ) {
+                                                if ( array_search( $fieldtype_lowercased, $blob_fields, true ) < array_search( $tablefield_type_lowercased, $blob_fields, true ) ) {
                                                         $do_change = false;
                                                 }
@@ -2902 +2902 @@
 
                                 // Check if the index definition exists, ignoring subparts.
-                                $aindex = array_search( $index_string, $indices_without_subparts );
+                                $aindex = array_search( $index_string, $indices_without_subparts, true );
                                 if ( false !== $aindex ) {
                                         // If the index already exists (even with different subparts), we don't need to create it.
@@ -3246 +3246 @@
         foreach ( (array) $plugins as $plugin ) {
                 if ( basename( $plugin ) == 'widgets.php' ) {
-                        array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
+                        array_splice( $plugins, array_search( $plugin, $plugins, true ), 1 );
                         update_option( 'active_plugins', $plugins );
                         break;