<!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>[55921] trunk: Taxonomy: Prevent deprecation notices clearing terms.</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/55921">55921</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/55921","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-14 23:49:36 +0000 (Wed, 14 Jun 2023)</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'>Taxonomy: Prevent deprecation notices clearing terms.
Prevents `wp_set_object_terms()` throwing a deprecation notice in PHP 8.1+ when passing an empty value as the second parameter to clear the terms.
Props audrasjb, chouby, costdev, jrf, peterwilsoncc, prashantbhivsane, sergeybiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/57923">#57923</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermwpSetObjectTermsphp">trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2023-06-14 20:44:53 UTC (rev 55920)
+++ trunk/src/wp-includes/taxonomy.php 2023-06-14 23:49:36 UTC (rev 55921)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2737,7 +2737,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $object_id The object to relate to.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|int|array $terms A single term slug, single term ID, or array of either term slugs or IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> * Will replace all existing related terms in this taxonomy. Passing an
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * empty value will remove all related terms.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * empty array will remove all related terms.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy The context in which to relate the term to the object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $append Optional. If false will delete difference of terms. Default false.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error Term taxonomy IDs of the affected terms or WP_Error on failure.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2751,7 +2751,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
</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">- if ( ! is_array( $terms ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $terms ) ) {
+ $terms = array();
+ } elseif ( ! is_array( $terms ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = array( $terms );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpSetObjectTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2023-06-14 20:44:53 UTC (rev 55920)
+++ trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2023-06-14 23:49:36 UTC (rev 55921)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,11 +4,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Term_WpSetObjectTerms extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $taxonomy = 'category';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $taxonomy = 'category';
</ins><span class="cx" style="display: block; padding: 0 10px"> protected static $post_ids = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $term_ids = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$post_ids = $factory->post->create_many( 5 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$term_ids = $factory->term->create_many( 5, array( 'taxonomy' => self::$taxonomy ) );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,13 +107,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 3; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = "term_{$i}";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_insert_term( $term, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_insert_term( $term, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id[ $term ] = $result['term_id'];
</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"> foreach ( $ids as $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tt = wp_set_object_terms( $id, array_values( $term_id ), $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tt = wp_set_object_terms( $id, array_values( $term_id ), self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Should return three term taxonomy IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 3, $tt );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,13 +120,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Each term should be associated with every post.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_id as $term => $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_objects_in_term( $id, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_objects_in_term( $id, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $ids, array_map( 'intval', $actual ) );
</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"> // Each term should have a count of 5.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $term_id ) as $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = get_term_by( 'name', $term, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = get_term_by( 'name', $term, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 5, $t->count );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,12 +141,12 @@
</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"> foreach ( $ids as $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tt = wp_set_object_terms( $id, $terms, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tt = wp_set_object_terms( $id, $terms, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Should return three term taxonomy IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 3, $tt );
</span><span class="cx" style="display: block; padding: 0 10px"> // Remember which term has which term_id.
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 3; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term = get_term_by( 'name', $terms[ $i ], $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = get_term_by( 'name', $terms[ $i ], self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id[ $terms[ $i ] ] = (int) $term->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,13 +153,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Each term should be associated with every post.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_id as $term => $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actual = get_objects_in_term( $id, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actual = get_objects_in_term( $id, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $ids, array_map( 'intval', $actual ) );
</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"> // Each term should have a count of 5.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t = get_term_by( 'name', $term, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t = get_term_by( 'name', $term, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 5, $t->count );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1 = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 3; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = "term_{$i}";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_insert_term( $term, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_insert_term( $term, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_1[ $i ] = $result['term_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,17 +265,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_2[0] = $terms_1[1];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term = 'term';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = wp_insert_term( $term, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_insert_term( $term, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms_2[1] = $result['term_id'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the initial terms.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tt_1 = wp_set_object_terms( $post_id, $terms_1, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 3, $tt_1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure they're correct.
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->taxonomy,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,13 +284,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $terms_1, $terms );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Change the terms.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tt_2 = wp_set_object_terms( $post_id, $terms_2, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $tt_2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure they're correct.
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->taxonomy,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,13 +313,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms_2 = array( 'bar', 'bing' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the initial terms.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tt_1 = wp_set_object_terms( $post_id, $terms_1, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 3, $tt_1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure they're correct.
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->taxonomy,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,13 +328,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $terms_1, $terms );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Change the terms.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tt_2 = wp_set_object_terms( $post_id, $terms_2, self::$taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 2, $tt_2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure they're correct.
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->taxonomy,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::$taxonomy,
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'names',
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'term_id',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,4 +432,48 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array(), $tt_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Tests that empty values clear an object of all terms.
+ *
+ * @ticket 57923
+ *
+ * @dataProvider data_empty_value_should_clear_terms
+ *
+ * @param mixed $empty_value An empty value.
+ */
+ public function test_empty_value_should_clear_terms( $empty_value ) {
+ $post_id = self::$post_ids[0];
+
+ // Assign some terms.
+ wp_set_object_terms( $post_id, self::$term_ids, self::$taxonomy );
+
+ // Make sure the terms are set.
+ $terms = wp_get_object_terms( $post_id, self::$taxonomy, array( 'fields' => 'names' ) );
+ $this->assertNotEmpty( $terms, 'Terms should initially be applied to post object.' );
+
+ // Remove terms by passing an empty value.
+ wp_set_object_terms( $post_id, $empty_value, self::$taxonomy );
+
+ // Make sure the terms have been removed.
+ $terms = wp_get_object_terms( $post_id, self::$taxonomy, array( 'fields' => 'names' ) );
+ $this->assertEmpty( $terms, 'An empty() value should clear terms from the post object.' );
+ }
+
+ /**
+ * Data provider.
+ *
+ * @return array[]
+ */
+ public function data_empty_value_should_clear_terms() {
+ return array(
+ '(bool) false' => array( false ),
+ 'null' => array( null ),
+ '(int) 0' => array( 0 ),
+ '(float) 0.0' => array( 0.0 ),
+ 'empty string' => array( '' ),
+ '(string) 0' => array( '0' ),
+ 'empty array' => array( array() ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>