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

trunk/src/wp-includes/taxonomy.php

@@ -621 +621 @@
         }
 
-        if ( ! in_array( $object_type, $wp_taxonomies[ $taxonomy ]->object_type ) ) {
+        if ( ! in_array( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true ) ) {
                 $wp_taxonomies[ $taxonomy ]->object_type[] = $object_type;
         }
@@ -1527 +1527 @@
 function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
         $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
-        if ( in_array( $field, $int_fields ) ) {
+        if ( in_array( $field, $int_fields, true ) ) {
                 $value = (int) $value;
                 if ( $value < 0 ) {
@@ -2237 +2237 @@
 
                                 $existing_term = null;
-                                if ( ( ! $slug_provided || $name_match->slug === $slug ) && in_array( $name, wp_list_pluck( $siblings, 'name' ) ) ) {
+                                $sibling_names = wp_list_pluck( $siblings, 'name' );
+                                $sibling_slugs = wp_list_pluck( $siblings, 'slug' );
+
+                                if ( ( ! $slug_provided || $name_match->slug === $slug ) && in_array( $name, $sibling_names, true ) ) {
                                         $existing_term = $name_match;
-                                } elseif ( $slug_match && in_array( $slug, wp_list_pluck( $siblings, 'slug' ) ) ) {
+                                } elseif ( $slug_match && in_array( $slug, $sibling_slugs, true ) ) {
                                         $existing_term = $slug_match;
                                 }
@@ -3701 +3704 @@
         $object_types = array_unique( $object_types );
 
-        $check_attachments = array_search( 'attachment', $object_types );
+        $check_attachments = array_search( 'attachment', $object_types, true );
         if ( false !== $check_attachments ) {
                 unset( $object_types[ $check_attachments ] );
@@ -4446 +4449 @@
         foreach ( $object_terms as $object_term ) {
                 // If term is an int, check against term_ids only.
-                if ( $ints && in_array( $object_term->term_id, $ints ) ) {
+                if ( $ints && in_array( $object_term->term_id, $ints, true ) ) {
                         return true;
                 }
@@ -4457 +4460 @@
                         }
 
-                        if ( in_array( $object_term->name, $strs ) ) {
+                        if ( in_array( $object_term->name, $strs, true ) ) {
                                 return true;
                         }
-                        if ( in_array( $object_term->slug, $strs ) ) {
+                        if ( in_array( $object_term->slug, $strs, true ) ) {
                                 return true;
                         }
@@ -4483 +4486 @@
                 return false;
         }
-        return in_array( $taxonomy, $taxonomies );
+        return in_array( $taxonomy, $taxonomies, true );
 }