<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[52972] trunk/src/wp-includes/class-wp-term-query.php: Coding Standards: Simplify some long conditions in `wp-includes/class-wp-term-query.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/52972">52972</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/52972","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-03-21 11:54:01 +0000 (Mon, 21 Mar 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/changeset/40293">[40293]</a>, <a href="https://core.trac.wordpress.org/changeset/52970">[52970]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55352">#55352</a>, <a href="https://core.trac.wordpress.org/ticket/54728">#54728</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswptermqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2022-03-21 10:30:55 UTC (rev 52971)
+++ trunk/src/wp-includes/class-wp-term-query.php 2022-03-21 11:54:01 UTC (rev 52972)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $order = $this->parse_order( $this->query_vars['order'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $taxonomies ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['taxonomy'] = "tt.taxonomy IN ('" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['taxonomy'] =
+ "tt.taxonomy IN ('" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "')";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $exclude = $args['exclude'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,7 +527,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['exclusions'] = preg_replace( '/^\s*AND\s*/', '', $exclusions );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['name'] = is_string( $args['name'] ) && 0 === strlen( $args['name'] ) ? array() : (array) $args['name'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $args['name'] ) {
+ $args['name'] = array();
+ } else {
+ $args['name'] = (array) $args['name'];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['name'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $names = $args['name'];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $names as &$_name ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +543,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['name'] = "t.name IN ('" . implode( "', '", array_map( 'esc_sql', $names ) ) . "')";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['slug'] = is_string( $args['slug'] ) && 0 === strlen( $args['slug'] ) ? array() : array_map( 'sanitize_title', (array) $args['slug'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $args['slug'] ) {
+ $args['slug'] = array();
+ } else {
+ $args['slug'] = array_map( 'sanitize_title', (array) $args['slug'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['slug'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = implode( "', '", $args['slug'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,7 +555,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sql_clauses['where']['slug'] = "t.slug IN ('" . $slug . "')";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $args['term_taxonomy_id'] ) {
+ $args['term_taxonomy_id'] = array();
+ } else {
+ $args['term_taxonomy_id'] = array_map( 'intval', (array) $args['term_taxonomy_id'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['term_taxonomy_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tt_ids = implode( ',', $args['term_taxonomy_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -552,14 +568,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['name__like'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['name__like'] = $wpdb->prepare( 't.name LIKE %s', '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['name__like'] = $wpdb->prepare(
+ 't.name LIKE %s',
+ '%' . $wpdb->esc_like( $args['name__like'] ) . '%'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['description__like'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->sql_clauses['where']['description__like'] = $wpdb->prepare( 'tt.description LIKE %s', '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->sql_clauses['where']['description__like'] = $wpdb->prepare(
+ 'tt.description LIKE %s',
+ '%' . $wpdb->esc_like( $args['description__like'] ) . '%'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['object_ids'] = is_string( $args['object_ids'] ) && 0 === strlen( $args['object_ids'] ) ? array() : array_map( 'intval', (array) $args['object_ids'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $args['object_ids'] ) {
+ $args['object_ids'] = array();
+ } else {
+ $args['object_ids'] = array_map( 'intval', (array) $args['object_ids'] );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['object_ids'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $object_ids = implode( ', ', $args['object_ids'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -665,6 +692,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $where = implode( ' AND ', $this->sql_clauses['where'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pieces = compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the terms query SQL clauses.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,7 +703,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $taxonomies An array of taxonomy names.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of term query arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $clauses = apply_filters( 'terms_clauses', compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' ), $taxonomies, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $clauses = apply_filters( 'terms_clauses', $pieces, $taxonomies, $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $join = isset( $clauses['join'] ) ? $clauses['join'] : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,14 +745,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // $args can be anything. Only use the args defined in defaults to compute the key.
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_args = wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $cache_args['pad_counts'], $cache_args['update_term_meta_cache'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'count' !== $_fields && 'all_with_object_id' !== $_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_args['fields'] = 'all';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = md5( serialize( $cache_args ) . serialize( $taxonomies ) . $this->request );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_changed = wp_cache_get_last_changed( 'terms' );
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_key = "get_terms:$key:$last_changed";
</span><span class="cx" style="display: block; padding: 0 10px"> $cache = wp_cache_get( $cache_key, 'terms' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $cache ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'ids' === $_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term_ids = wp_list_pluck( $cache, 'term_id' );
</span></span></pre>
</div>
</div>
</body>
</html>