Changeset 47557 for trunk/src/wp-includes/taxonomy.php

Timestamp:

04/09/2020 03:41:04 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search().

This addresses all the remaining WordPress.PHP.StrictInArray.MissingTrueStrict issues in core.

Includes minor code layout fixes for better readability.

Follow-up to [47550].

See #49542.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (11 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -2469 +2469 @@
 
         $term_info = term_exists( $term, $taxonomy );
+
         if ( ! $term_info ) {
             // Skip if a non-existent term ID is passed.
@@ -2474 +2475 @@
                 continue;
             }
+
             $term_info = wp_insert_term( $term, $taxonomy );
         }
+
         if ( is_wp_error( $term_info ) ) {
             return $term_info;
         }
+
         $term_ids[] = $term_info['term_id'];
         $tt_id      = $term_info['term_taxonomy_id'];
@@ -2498 +2502 @@
          */
         do_action( 'add_term_relationship', $object_id, $tt_id, $taxonomy );
+
         $wpdb->insert(
             $wpdb->term_relationships,
@@ -2517 +2522 @@
          */
         do_action( 'added_term_relationship', $object_id, $tt_id, $taxonomy );
+
         $new_tt_ids[] = $tt_id;
     }
@@ -2540 +2546 @@
 
     $t = get_taxonomy( $taxonomy );
+
     if ( ! $append && isset( $t->sort ) && $t->sort ) {
-        $values       = array();
-        $term_order   = 0;
+        $values     = array();
+        $term_order = 0;
+
         $final_tt_ids = wp_get_object_terms(
             $object_id,
@@ -2551 +2559 @@
             )
         );
+
         foreach ( $tt_ids as $tt_id ) {
-            if ( in_array( $tt_id, $final_tt_ids ) ) {
+            if ( in_array( (int) $tt_id, $final_tt_ids, true ) ) {
                 $values[] = $wpdb->prepare( '(%d, %d, %d)', $object_id, $tt_id, ++$term_order );
             }
         }
+
         if ( $values ) {
             if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . ' ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)' ) ) {
@@ -2579 +2589 @@
      */
     do_action( 'set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids );
+
     return $tt_ids;
 }
@@ -3617 +3628 @@
     $object_types = esc_sql( $tax_obj->object_type );
     $results      = $wpdb->get_results( "SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode( ',', array_keys( $term_ids ) ) . ") AND post_type IN ('" . implode( "', '", $object_types ) . "') AND post_status = 'publish'" );
+
     foreach ( $results as $row ) {
-        $id                                   = $term_ids[ $row->term_taxonomy_id ];
+        $id = $term_ids[ $row->term_taxonomy_id ];
+
         $term_items[ $id ][ $row->object_id ] = isset( $term_items[ $id ][ $row->object_id ] ) ? ++$term_items[ $id ][ $row->object_id ] : 1;
     }
@@ -3628 +3641 @@
         while ( ! empty( $terms_by_id[ $child ] ) && $parent = $terms_by_id[ $child ]->parent ) {
             $ancestors[] = $child;
+
             if ( ! empty( $term_items[ $term_id ] ) ) {
                 foreach ( $term_items[ $term_id ] as $item_id => $touches ) {
@@ -3633 +3647 @@
                 }
             }
+
             $child = $parent;
 
-            if ( in_array( $parent, $ancestors ) ) {
+            if ( in_array( $parent, $ancestors, true ) ) {
                 break;
             }
@@ -4523 +4538 @@
     if ( 'taxonomy' === $resource_type ) {
         $term = get_term( $object_id, $object_type );
-        while ( ! is_wp_error( $term ) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
+        while ( ! is_wp_error( $term ) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors, true ) ) {
             $ancestors[] = (int) $term->parent;
             $term        = get_term( $term->parent, $object_type );