Changeset 52972 for trunk/src/wp-includes/class-wp-term-query.php

Timestamp:

03/21/2022 11:54:01 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Simplify some long conditions in wp-includes/class-wp-term-query.php.

This aims to improve readability and make the logic easier to parse at a glance.

Follow-up to [40293], [52970].

See #55352, #54728.

File:

• trunk/src/wp-includes/class-wp-term-query.php (modified) (8 diffs)

trunk/src/wp-includes/class-wp-term-query.php

@@ -454 +454 @@
 
                 if ( $taxonomies ) {
-                        $this->sql_clauses['where']['taxonomy'] = "tt.taxonomy IN ('" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "')";
+                        $this->sql_clauses['where']['taxonomy'] =
+                                "tt.taxonomy IN ('" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "')";
                 }
 
@@ -527 +528 @@
                 }
 
-                $args['name'] = is_string( $args['name'] ) && 0 === strlen( $args['name'] ) ? array() : (array) $args['name'];
+                if ( '' === $args['name'] ) {
+                        $args['name'] = array();
+                } else {
+                        $args['name'] = (array) $args['name'];
+                }
+
                 if ( ! empty( $args['name'] ) ) {
                         $names = $args['name'];
@@ -538 +544 @@
                 }
 
-                $args['slug'] = is_string( $args['slug'] ) && 0 === strlen( $args['slug'] ) ? array() : array_map( 'sanitize_title', (array) $args['slug'] );
+                if ( '' === $args['slug'] ) {
+                        $args['slug'] = array();
+                } else {
+                        $args['slug'] = array_map( 'sanitize_title', (array) $args['slug'] );
+                }
+
                 if ( ! empty( $args['slug'] ) ) {
                         $slug = implode( "', '", $args['slug'] );
@@ -545 +556 @@
                 }
 
-                $args['term_taxonomy_id'] = is_string( $args['term_taxonomy_id'] ) && 0 === strlen( $args['term_taxonomy_id'] ) ? array() : array_map( 'intval', (array) $args['term_taxonomy_id'] );
+                if ( '' === $args['term_taxonomy_id'] ) {
+                        $args['term_taxonomy_id'] = array();
+                } else {
+                        $args['term_taxonomy_id'] = array_map( 'intval', (array) $args['term_taxonomy_id'] );
+                }
+
                 if ( ! empty( $args['term_taxonomy_id'] ) ) {
                         $tt_ids = implode( ',', $args['term_taxonomy_id'] );
@@ -553 +569 @@
 
                 if ( ! empty( $args['name__like'] ) ) {
-                        $this->sql_clauses['where']['name__like'] = $wpdb->prepare( 't.name LIKE %s', '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
+                        $this->sql_clauses['where']['name__like'] = $wpdb->prepare(
+                                't.name LIKE %s',
+                                '%' . $wpdb->esc_like( $args['name__like'] ) . '%'
+                        );
                 }
 
                 if ( ! empty( $args['description__like'] ) ) {
-                        $this->sql_clauses['where']['description__like'] = $wpdb->prepare( 'tt.description LIKE %s', '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
-                }
-
-                $args['object_ids'] = is_string( $args['object_ids'] ) && 0 === strlen( $args['object_ids'] ) ? array() : array_map( 'intval', (array) $args['object_ids'] );
+                        $this->sql_clauses['where']['description__like'] = $wpdb->prepare(
+                                'tt.description LIKE %s',
+                                '%' . $wpdb->esc_like( $args['description__like'] ) . '%'
+                        );
+                }
+
+                if ( '' === $args['object_ids'] ) {
+                        $args['object_ids'] = array();
+                } else {
+                        $args['object_ids'] = array_map( 'intval', (array) $args['object_ids'] );
+                }
+
                 if ( ! empty( $args['object_ids'] ) ) {
                         $object_ids = implode( ', ', $args['object_ids'] );
@@ -666 +693 @@
                 $where = implode( ' AND ', $this->sql_clauses['where'] );
 
+                $pieces = compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
+
                 /**
                  * Filters the terms query SQL clauses.
@@ -675 +704 @@
                  * @param array    $args       An array of term query arguments.
                  */
-                $clauses = apply_filters( 'terms_clauses', compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' ), $taxonomies, $args );
+                $clauses = apply_filters( 'terms_clauses', $pieces, $taxonomies, $args );
 
                 $fields   = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
@@ -717 +746 @@
                 // $args can be anything. Only use the args defined in defaults to compute the key.
                 $cache_args = wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) );
+
                 unset( $cache_args['pad_counts'], $cache_args['update_term_meta_cache'] );
+
                 if ( 'count' !== $_fields && 'all_with_object_id' !== $_fields ) {
                         $cache_args['fields'] = 'all';
                 }
+
                 $key          = md5( serialize( $cache_args ) . serialize( $taxonomies ) . $this->request );
                 $last_changed = wp_cache_get_last_changed( 'terms' );
                 $cache_key    = "get_terms:$key:$last_changed";
                 $cache        = wp_cache_get( $cache_key, 'terms' );
+
                 if ( false !== $cache ) {
                         if ( 'ids' === $_fields ) {