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

trunk/src/wp-includes/wp-db.php

@@ -866 +866 @@
 
                 foreach ( $modes as $i => $mode ) {
-                        if ( in_array( $mode, $incompatible_modes ) ) {
+                        if ( in_array( $mode, $incompatible_modes, true ) ) {
                                 unset( $modes[ $i ] );
                         }
@@ -1040 +1040 @@
                         $global_tables = array_merge( $this->global_tables, $this->ms_global_tables );
                         foreach ( $tables as $k => $table ) {
-                                if ( in_array( $table, $global_tables ) ) {
+                                if ( in_array( $table, $global_tables, true ) ) {
                                         $tables[ $table ] = $base_prefix . $table;
                                 } else {
@@ -2210 +2210 @@
                 $this->insert_id = 0;
 
-                if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) ) {
+                if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ), true ) ) {
                         return false;
                 }
@@ -2744 +2744 @@
 
                         // A binary/blob means the whole query gets treated like this.
-                        if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ) ) ) {
+                        if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ), true ) ) {
                                 $this->table_charset[ $tablekey ] = 'binary';
                                 return 'binary';