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

Timestamp:

08/01/2019 01:44:04 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-includes/taxonomy.php.

Props andizer, SergeyBiryukov.
Fixes #47573.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -194 +194 @@
         global $wp_taxonomies;
 
-        $field = ( 'names' == $output ) ? 'name' : false;
+        $field = ( 'names' === $output ) ? 'name' : false;
 
         return wp_filter_object_list( $wp_taxonomies, $args, $operator, $field );
@@ -224 +224 @@
 
         if ( is_object( $object ) ) {
-                if ( $object->post_type == 'attachment' ) {
+                if ( $object->post_type === 'attachment' ) {
                         return get_attachment_taxonomies( $object, $output );
                 }
@@ -235 +235 @@
         foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
                 if ( array_intersect( $object, (array) $tax_obj->object_type ) ) {
-                        if ( 'names' == $output ) {
+                        if ( 'names' === $output ) {
                                 $taxonomies[] = $tax_name;
                         } else {
@@ -726 +726 @@
         $args     = wp_parse_args( $args, $defaults );
 
-        $order = ( 'desc' == strtolower( $args['order'] ) ) ? 'DESC' : 'ASC';
+        $order = ( 'desc' === strtolower( $args['order'] ) ) ? 'DESC' : 'ASC';
 
         $term_ids = array_map( 'intval', $term_ids );
@@ -877 +877 @@
         $_term->filter( $filter );
 
-        if ( $output == ARRAY_A ) {
+        if ( $output === ARRAY_A ) {
                 return $_term->to_array();
-        } elseif ( $output == ARRAY_N ) {
+        } elseif ( $output === ARRAY_N ) {
                 return array_values( $_term->to_array() );
         }
@@ -1015 +1015 @@
 
         foreach ( (array) $terms[ $term_id ] as $child ) {
-                if ( $term_id == $child ) {
+                if ( $term_id === $child ) {
                         continue;
                 }
@@ -1372 +1372 @@
 
         if ( is_int( $term ) ) {
-                if ( 0 == $term ) {
+                if ( 0 === $term ) {
                         return 0;
                 }
@@ -1446 +1446 @@
                 return false;
         }
-        if ( $term2->parent == $term1->term_id ) {
+        if ( $term2->parent === $term1->term_id ) {
                 return true;
         }
@@ -1530 +1530 @@
         }
 
-        if ( 'raw' == $context ) {
+        $context = strtolower( $context );
+
+        if ( 'raw' === $context ) {
                 return $value;
         }
 
-        if ( 'edit' == $context ) {
+        if ( 'edit' === $context ) {
 
                 /**
@@ -1562 +1564 @@
                 $value = apply_filters( "edit_{$taxonomy}_{$field}", $value, $term_id );
 
-                if ( 'description' == $field ) {
+                if ( 'description' === $field ) {
                         $value = esc_html( $value ); // textarea_escaped
                 } else {
                         $value = esc_attr( $value );
                 }
-        } elseif ( 'db' == $context ) {
+        } elseif ( 'db' === $context ) {
 
                 /**
@@ -1594 +1596 @@
 
                 // Back compat filters
-                if ( 'slug' == $field ) {
+                if ( 'slug' === $field ) {
                         /**
                          * Filters the category nicename before it is sanitized.
@@ -1606 +1608 @@
                         $value = apply_filters( 'pre_category_nicename', $value );
                 }
-        } elseif ( 'rss' == $context ) {
+        } elseif ( 'rss' === $context ) {
 
                 /**
@@ -1663 +1665 @@
         }
 
-        if ( 'attribute' == $context ) {
+        if ( 'attribute' === $context ) {
                 $value = esc_attr( $value );
-        } elseif ( 'js' == $context ) {
+        } elseif ( 'js' === $context ) {
                 $value = esc_js( $value );
         }
@@ -1768 +1770 @@
         $defaults = array();
 
-        if ( 'category' == $taxonomy ) {
+        if ( 'category' === $taxonomy ) {
                 $defaults['default'] = get_option( 'default_category' );
-                if ( $defaults['default'] == $term ) {
+                if ( $defaults['default'] === $term ) {
                         return 0; // Don't delete the default category
                 }
@@ -1848 +1850 @@
                         )
                 );
-                if ( 1 == count( $terms ) && isset( $default ) ) {
+                if ( 1 === count( $terms ) && isset( $default ) ) {
                         $terms = array( $default );
                 } else {
@@ -2124 +2126 @@
                 return $term;
         }
-        if ( is_int( $term ) && 0 == $term ) {
+        if ( is_int( $term ) && 0 === $term ) {
                 return new WP_Error( 'invalid_term_id', __( 'Invalid term ID.' ) );
         }
-        if ( '' == trim( $term ) ) {
+        if ( '' === trim( $term ) ) {
                 return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
         }
@@ -2451 +2453 @@
 
         foreach ( (array) $terms as $term ) {
-                if ( ! strlen( trim( $term ) ) ) {
+                if ( '' === trim( $term ) ) {
                         continue;
                 }
@@ -2611 +2613 @@
 
         foreach ( (array) $terms as $term ) {
-                if ( ! strlen( trim( $term ) ) ) {
+                if ( '' === trim( $term ) ) {
                         continue;
                 }
@@ -2847 +2849 @@
         $parsed_args['description'] = $description;
 
-        if ( '' == trim( $name ) ) {
+        if ( '' === trim( $name ) ) {
                 return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
         }
@@ -2903 +2905 @@
          * @param array  $args        An array of update arguments for the given term.
          */
-        $parent = apply_filters( 'wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args );
+        $parent = (int) apply_filters( 'wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args );
 
         // Check for duplicate slug
         $duplicate = get_term_by( 'slug', $slug, $taxonomy );
-        if ( $duplicate && $duplicate->term_id != $term_id ) {
+        if ( $duplicate && $duplicate->term_id !== $term_id ) {
                 // If an empty slug was passed or the parent changed, reset the slug to something unique.
                 // Otherwise, bail.
-                if ( $empty_slug || ( $parent != $term['parent'] ) ) {
+                if ( $empty_slug || ( $parent !== (int) $term['parent'] ) ) {
                         $slug = wp_unique_term_slug( $slug, (object) $args );
                 } else {
@@ -3512 +3514 @@
         }
 
+        $term_id      = (int) $term_id;
         $term_list    = array();
         $has_children = _get_term_hierarchy( $taxonomy );
 
-        if ( ( 0 != $term_id ) && ! isset( $has_children[ $term_id ] ) ) {
+        if ( $term_id && ! isset( $has_children[ $term_id ] ) ) {
                 return $empty_array;
         }
@@ -3539 +3542 @@
                 }
 
-                if ( $term->parent == $term_id ) {
+                if ( $term->parent === $term_id ) {
                         if ( $use_id ) {
                                 $term_list[] = $term->term_id;
@@ -3786 +3789 @@
 
         // If there are no shared term_taxonomy rows, there's nothing to do here.
-        $shared_tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id ) );
+        $shared_tt_count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id ) );
 
         if ( ! $shared_tt_count ) {
@@ -3796 +3799 @@
          * If there's a mismatch, it may mean that the term is already split. Return the actual term_id from the db.
          */
-        $check_term_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
-        if ( $check_term_id != $term_id ) {
+        $check_term_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
+        if ( $check_term_id !== $term_id ) {
                 return $check_term_id;
         }
@@ -4020 +4023 @@
  */
 function _wp_check_split_default_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
-        if ( 'category' != $taxonomy ) {
+        if ( 'category' !== $taxonomy ) {
                 return;
         }
 
         foreach ( array( 'default_category', 'default_link_category', 'default_email_category' ) as $option ) {
-                if ( $term_id == get_option( $option, -1 ) ) {
+                if ( $term_id === (int) get_option( $option, -1 ) ) {
                         update_option( $option, $new_term_id );
                 }
@@ -4086 +4089 @@
         $locations = get_nav_menu_locations();
         foreach ( $locations as $location => $menu_id ) {
-                if ( $term_id == $menu_id ) {
+                if ( $term_id === $menu_id ) {
                         $locations[ $location ] = $new_term_id;
                 }
@@ -4206 +4209 @@
 
         if ( empty( $termlink ) ) {
-                if ( 'category' == $taxonomy ) {
+                if ( 'category' === $taxonomy ) {
                         $termlink = '?cat=' . $term->term_id;
                 } elseif ( $t->query_var ) {
@@ -4231 +4234 @@
         }
         // Back Compat filters.
-        if ( 'post_tag' == $taxonomy ) {
+        if ( 'post_tag' === $taxonomy ) {
 
                 /**
@@ -4243 +4246 @@
                  */
                 $termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
-        } elseif ( 'category' == $taxonomy ) {
+        } elseif ( 'category' === $taxonomy ) {
 
                 /**
@@ -4568 +4571 @@
 
         // Can't be its own parent.
-        if ( $parent == $term_id ) {
+        if ( $parent === $term_id ) {
                 return 0;
         }