<!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>[56421] trunk: Build/Test Tools: Update PHPUnit Polyfills to version 1.1.0.</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/56421">56421</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/56421","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>2023-08-21 15:53:04 +0000 (Mon, 21 Aug 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'>Build/Test Tools: Update PHPUnit Polyfills to version 1.1.0.
[https://github.com/sebastianbergmann/phpunit/blob/9.6/ChangeLog-9.6.md<a href="https://core.trac.wordpress.org/ticket/961">#961</a>---2023-02-03 PHPUnit 9.6.1] deprecated the `assertObjectHasAttribute()` and `assertObjectNotHasAttribute()` methods, leading to deprecation notices in a number of tests.
[https://github.com/sebastianbergmann/phpunit/blob/10.1.3/ChangeLog-10.1.md<a href="https://core.trac.wordpress.org/ticket/1010">#1010</a>---2023-04-14 PHPUnit 10.1.0] brought the methods back by popular request, though renamed as `assertObjectHasProperty()` and `assertObjectNotHasProperty()`, to prevent confusion with PHP 8.0 attributes.
This meant that users which cannot (yet) upgrade to PHPUnit 10.1+ would always have deprecation notices for these methods without recourse. So, after much discussion, the new methods have been backported to [https://github.com/sebastianbergmann/phpunit/blob/9.6/ChangeLog-9.6.md<a href="https://core.trac.wordpress.org/ticket/9611">#9611</a>---2023-08-19 PHPUnit 9.6.11], leaving just the 10.0.x series with a deprecation notice and no recourse.
What does this mean for WordPress?
WordPress uses the [https://github.com/Yoast/PHPUnit-Polyfills PHPUnit Polyfills] to be able to write tests for the most recent versions of PHPUnit, with the Polyfills taking care of polyfilling any new PHPUnit methods on older PHPUnit versions.
* The PHPUnit Polyfills 1.x series supports PHPUnit 4.x to 9.x.
* The PHPUnit Polyfills 2.x series supports PHPUnit 5.x to 10.x.
WordPress currently runs against PHPUnit 6.x to 9.x with PHPUnit Polyfills 1.x, while the new methods were previously only included in PHPUnit Polyfills 2.0.0+, as they were introduced in PHPUnit 10.x.
Since the `assertObjectHasProperty()` and `assertObjectNotHasProperty()` methods have been backported to PHPUnit 9.x, the PHPUnit Polyfills will now include these methods in the 1.x series as well.
By upgrading to the latest [https://github.com/Yoast/PHPUnit-Polyfills/releases/tag/1.1.0 PHPUnit Polyfills 1.1.0] release, we can get rid of the deprecation notices related to the use of the `assertObjectHasAttribute()` and `assertObjectNotHasAttribute()` methods.
This could have implications for plugins or themes running integration tests with WordPress if they have set their PHPUnit Polyfills dependency to a fixed version or have a too strict version constraint (limiting the PHPUnit Polyfills to the 1.0.x series). The solution for those plugins or themes is to update their version constraints for the PHPUnit Polyfills to allow for the 1.1.x series.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/51559">[51559]</a>, <a href="https://core.trac.wordpress.org/changeset/51598">[51598]</a>.
Props jrf, ayeshrajans.
Fixes <a href="https://core.trac.wordpress.org/ticket/59150">#59150</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkcomposerjson">trunk/composer.json</a></li>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunitincludesphpunitadaptertestcasephp">trunk/tests/phpunit/includes/phpunit-adapter-testcase.php</a></li>
<li><a href="#trunktestsphpunittestsajaxwpAjaxImageEditorphp">trunk/tests/phpunit/tests/ajax/wpAjaxImageEditor.php</a></li>
<li><a href="#trunktestsphpunittestsblocksregisterphp">trunk/tests/phpunit/tests/blocks/register.php</a></li>
<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenuitemsettingphp">trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php</a></li>
<li><a href="#trunktestsphpunittestspostgetPostTypeLabelsphp">trunk/tests/phpunit/tests/post/getPostTypeLabels.php</a></li>
<li><a href="#trunktestsphpunittestspostupdatePostCachephp">trunk/tests/phpunit/tests/post/updatePostCache.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestserverphp">trunk/tests/phpunit/tests/rest-api/rest-server.php</a></li>
<li><a href="#trunktestsphpunittestsrestapiwpRestTemplatesControllerphp">trunk/tests/phpunit/tests/rest-api/wpRestTemplatesController.php</a></li>
<li><a href="#trunktestsphpunitteststaxonomyphp">trunk/tests/phpunit/tests/taxonomy.php</a></li>
<li><a href="#trunktestsphpunitteststermqueryphp">trunk/tests/phpunit/tests/term/query.php</a></li>
<li><a href="#trunktestsphpunitteststermwpGetObjectTermsphp">trunk/tests/phpunit/tests/term/wpGetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkcomposerjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/composer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/composer.json 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/composer.json 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "squizlabs/php_codesniffer": "3.6.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "wp-coding-standards/wpcs": "~2.3.0",
</span><span class="cx" style="display: block; padding: 0 10px"> "phpcompatibility/phpcompatibility-wp": "~2.1.3",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "yoast/phpunit-polyfills": "^1.0.1"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "yoast/phpunit-polyfills": "^1.1.0"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "config": {
</span><span class="cx" style="display: block; padding: 0 10px"> "allow-plugins": {
</span></span></pre></div>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/includes/abstract-testcase.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,7 +869,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $fields, $message . ' Fields array is empty.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $fields as $field_name => $field_value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( $field_name, $actual, $message . " Property $field_name does not exist on the object." );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( $field_name, $actual, $message . " Property $field_name does not exist on the object." );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $field_value, $actual->$field_name, $message . " Value of property $field_name is not $field_value." );
</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="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/includes/bootstrap.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Minimum version of the PHPUnit Polyfills package as declared in `composer.json`.
</span><span class="cx" style="display: block; padding: 0 10px"> * Only needs updating when new polyfill features start being used in the test suite.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$phpunit_polyfills_minimum_version = '1.0.1';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$phpunit_polyfills_minimum_version = '1.1.0';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( class_exists( '\Yoast\PHPUnitPolyfills\Autoload' )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( defined( '\Yoast\PHPUnitPolyfills\Autoload::VERSION' ) === false
</span><span class="cx" style="display: block; padding: 0 10px"> || version_compare( Yoast\PHPUnitPolyfills\Autoload::VERSION, $phpunit_polyfills_minimum_version, '<' ) )
</span></span></pre></div>
<a id="trunktestsphpunitincludesphpunitadaptertestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/phpunit-adapter-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/phpunit-adapter-testcase.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/includes/phpunit-adapter-testcase.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * PHPUnit adapter layer.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This class enhances the PHPUnit native `TestCase` with polyfills
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * for assertions and expectation methods added between PHPUnit 4.8 - 9.5.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * for assertions and expectation methods added between PHPUnit 4.8 - 9.6.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Additionally, the Polyfill TestCase offers a workaround for the addition
</span><span class="cx" style="display: block; padding: 0 10px"> * of the `void` return type to PHPUnit fixture methods by providing
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxwpAjaxImageEditorphp"></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/ajax/wpAjaxImageEditor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/wpAjaxImageEditor.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/ajax/wpAjaxImageEditor.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = wp_save_image( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'error', $ret );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'error', $ret );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'Images cannot be scaled to a size larger than the original.', $ret->error );
</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="trunktestsphpunittestsblocksregisterphp"></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/blocks/register.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/blocks/register.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/blocks/register.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,7 +720,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $registry = WP_Block_Type_Registry::get_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $block_type = $registry->get_registered( 'core/test-static' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'editor_script_handles', $block_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'editor_script_handles', $block_type );
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual_script = $block_type->editor_script;
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_script_handles = $block_type->editor_script_handles;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,7 +786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $registry = WP_Block_Type_Registry::get_instance();
</span><span class="cx" style="display: block; padding: 0 10px"> $block_type = $registry->get_registered( 'core/test-static' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'editor_script_handles', $block_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'editor_script_handles', $block_type );
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual_script = $block_type->editor_script;
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_script_handles = $block_type->editor_script_handles;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/comment.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -481,7 +481,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'The comment is not an instance of WP_Comment.'
</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">- $this->assertObjectHasAttribute(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_author',
</span><span class="cx" style="display: block; padding: 0 10px"> $comment,
</span><span class="cx" style="display: block; padding: 0 10px"> 'The comment object does not have a "comment_author" property.'
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/customize/manager.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3339,7 +3339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $setting_id = 'dynamic';
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $manager->add_setting( $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'WP_Customize_Setting', get_class( $setting ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectNotHasAttribute( 'custom', $setting );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectNotHasProperty( 'custom', $setting );
</ins><span class="cx" style="display: block; padding: 0 10px"> $manager->remove_setting( $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_dynamic_setting_class', array( $this, 'return_dynamic_customize_setting_class' ), 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3346,7 +3346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'customize_dynamic_setting_args', array( $this, 'return_dynamic_customize_setting_args' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $setting = $manager->add_setting( $setting_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Test_Dynamic_Customize_Setting', get_class( $setting ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'custom', $setting );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'custom', $setting );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'foo', $setting->custom );
</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="trunktestsphpunittestscustomizenavmenuitemsettingphp"></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/customize/nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/customize/nav-menu-item-setting.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,17 +926,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_item = $setting->value_as_wp_post_nav_menu_item();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Custom Label', $nav_menu_item->type_label );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectNotHasAttribute( 'nav_menu_term_id', $nav_menu_item );
- $this->assertObjectNotHasAttribute( 'status', $nav_menu_item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectNotHasProperty( 'nav_menu_term_id', $nav_menu_item );
+ $this->assertObjectNotHasProperty( 'status', $nav_menu_item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'publish', $nav_menu_item->post_status );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'nav_menu_item', $nav_menu_item->post_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectNotHasAttribute( 'position', $nav_menu_item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectNotHasProperty( 'position', $nav_menu_item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post_value['position'], $nav_menu_item->menu_order );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $post_value['title'], $nav_menu_item->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 123, $nav_menu_item->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 123, $nav_menu_item->db_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( wp_get_current_user()->ID, $nav_menu_item->post_author );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'type_label', $nav_menu_item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'type_label', $nav_menu_item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = apply_filters( 'nav_menu_attr_title', wp_unslash( apply_filters( 'excerpt_save_pre', wp_slash( $post_value['attr_title'] ) ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $nav_menu_item->attr_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'Attempted \o/ o’o markup', $nav_menu_item->description );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,7 +1070,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_post_title, $item_value['original_title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $item_value['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $item = $setting->value_as_wp_post_nav_menu_item();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'type_label', $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'type_label', $item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_post_title, $item->original_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_post_title, $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'type_label', $item_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1097,7 +1097,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_post_title, $item_value['original_title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $item_value['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $item = $setting->value_as_wp_post_nav_menu_item();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'type_label', $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'type_label', $item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_post_title, $item->original_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_post_title, $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'type_label', $item_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1124,7 +1124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_term_title, $item_value['original_title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $item_value['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $item = $setting->value_as_wp_post_nav_menu_item();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'type_label', $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'type_label', $item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_term_title, $item->original_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_term_title, $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'type_label', $item_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1151,7 +1151,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_term_title, $item_value['original_title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $item_value['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $item = $setting->value_as_wp_post_nav_menu_item();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'type_label', $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'type_label', $item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_term_title, $item->original_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $original_term_title, $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'type_label', $item_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1177,7 +1177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $item_value['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $item = $setting->value_as_wp_post_nav_menu_item();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'type_label', $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'type_label', $item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'type_label', $item_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1203,7 +1203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( '', $item_value['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $item = $setting->value_as_wp_post_nav_menu_item();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'type_label', $item );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'type_label', $item );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->title );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'type_label', $item_value );
</span></span></pre></div>
<a id="trunktestsphpunittestspostgetPostTypeLabelsphp"></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/post/getPostTypeLabels.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/getPostTypeLabels.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/post/getPostTypeLabels.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,9 +95,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unregister_post_type( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'labels', $post_type_object );
- $this->assertObjectHasAttribute( 'label', $post_type_object );
- $this->assertObjectHasAttribute( 'not_found_in_trash', $post_type_object->labels );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'labels', $post_type_object );
+ $this->assertObjectHasProperty( 'label', $post_type_object );
+ $this->assertObjectHasProperty( 'not_found_in_trash', $post_type_object->labels );
</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"> public function test_label_should_be_derived_from_labels_when_registering_a_post_type() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,8 +122,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'post_type_labels_foo', array( $this, 'filter_post_type_labels' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_type( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'featured_image', get_post_type_object( 'foo' )->labels );
- $this->assertObjectHasAttribute( 'set_featured_image', get_post_type_object( 'foo' )->labels );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'featured_image', get_post_type_object( 'foo' )->labels );
+ $this->assertObjectHasProperty( 'set_featured_image', get_post_type_object( 'foo' )->labels );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unregister_post_type( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'post_type_labels_foo', array( $this, 'filter_post_type_labels' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestspostupdatePostCachephp"></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/post/updatePostCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/updatePostCache.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/post/updatePostCache.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'The cached post is not an object'
</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">- $this->assertObjectHasAttribute(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter',
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_post,
</span><span class="cx" style="display: block; padding: 0 10px"> 'The cached post does not have a "filter" property'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'The cached post is not an object'
</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">- $this->assertObjectHasAttribute(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter',
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_post,
</span><span class="cx" style="display: block; padding: 0 10px"> 'The cached post does not have a "filter" property'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'The cached post is not an object'
</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">- $this->assertObjectHasAttribute(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'filter',
</span><span class="cx" style="display: block; padding: 0 10px"> $cached_post,
</span><span class="cx" style="display: block; padding: 0 10px"> 'The cached post does not have a "filter" property'
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/post.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'test' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $counts = wp_count_posts();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'test', $counts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'test', $counts );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, $counts->test );
</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="trunktestsphpunittestsrestapirestserverphp"></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/rest-api/rest-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-server.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/rest-api/rest-server.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1261,7 +1261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = json_decode( rest_get_server()->sent_body );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectNotHasAttribute( 'code', $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectNotHasProperty( 'code', $result );
</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"> public function test_link_header_on_requests() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapiwpRestTemplatesControllerphp"></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/rest-api/wpRestTemplatesController.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/wpRestTemplatesController.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/rest-api/wpRestTemplatesController.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,13 +870,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'stdClass', $prepared, 'The item could not be prepared for the database.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'post_type', $prepared, 'The "post_type" was not included in the prepared template part.' );
- $this->assertObjectHasAttribute( 'post_status', $prepared, 'The "post_status" was not included in the prepared template part.' );
- $this->assertObjectHasAttribute( 'tax_input', $prepared, 'The "tax_input" was not included in the prepared template part.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'post_type', $prepared, 'The "post_type" was not included in the prepared template part.' );
+ $this->assertObjectHasProperty( 'post_status', $prepared, 'The "post_status" was not included in the prepared template part.' );
+ $this->assertObjectHasProperty( 'tax_input', $prepared, 'The "tax_input" was not included in the prepared template part.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'wp_theme', $prepared->tax_input, 'The "wp_theme" tax was not included in the prepared template part.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'wp_template_part_area', $prepared->tax_input, 'The "wp_template_part_area" tax was not included in the prepared template part.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'post_content', $prepared, 'The "post_content" was not included in the prepared template part.' );
- $this->assertObjectHasAttribute( 'post_title', $prepared, 'The "post_title" was not included in the prepared template part.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'post_content', $prepared, 'The "post_content" was not included in the prepared template part.' );
+ $this->assertObjectHasProperty( 'post_title', $prepared, 'The "post_title" was not included in the prepared template part.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'wp_template_part', $prepared->post_type, 'The "post_type" in the prepared template part should be "wp_template_part".' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'publish', $prepared->post_status, 'The post status in the prepared template part should be "publish".' );
</span></span></pre></div>
<a id="trunktestsphpunitteststaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/taxonomy.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/taxonomy.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a post type to test with.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'test_cpt';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( get_post_type( $post_type ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'name', register_post_type( $post_type ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'name', register_post_type( $post_type ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Core taxonomy, core post type.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( unregister_taxonomy_for_object_type( 'category', 'post' ) );
</span></span></pre></div>
<a id="trunktestsphpunitteststermqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/query.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/term/query.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $terms );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Term', $term );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'object_id', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'object_id', $term );
</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"> // Run again to check the cached response.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,7 +410,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotEmpty( $terms );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Term', $term );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'object_id', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'object_id', $term );
</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></pre></div>
<a id="trunktestsphpunitteststermwpGetObjectTermsphp"></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/wpGetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/term/wpGetObjectTerms.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -850,7 +850,7 @@
</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"> $term = get_term( $t );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectNotHasAttribute( 'object_id', $term );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectNotHasProperty( 'object_id', $term );
</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></pre></div>
<a id="trunktestsphpunittestsusermultisitephp"></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/user/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2023-08-20 00:08:49 UTC (rev 56420)
+++ trunk/tests/phpunit/tests/user/multisite.php 2023-08-21 15:53:04 UTC (rev 56421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,15 +59,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Each site retrieved should match the expected structure.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blogs_of_user as $blog_id => $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $blog_id, $blog->userblog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertObjectHasAttribute( 'userblog_id', $blog );
- $this->assertObjectHasAttribute( 'blogname', $blog );
- $this->assertObjectHasAttribute( 'domain', $blog );
- $this->assertObjectHasAttribute( 'path', $blog );
- $this->assertObjectHasAttribute( 'site_id', $blog );
- $this->assertObjectHasAttribute( 'siteurl', $blog );
- $this->assertObjectHasAttribute( 'archived', $blog );
- $this->assertObjectHasAttribute( 'spam', $blog );
- $this->assertObjectHasAttribute( 'deleted', $blog );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertObjectHasProperty( 'userblog_id', $blog );
+ $this->assertObjectHasProperty( 'blogname', $blog );
+ $this->assertObjectHasProperty( 'domain', $blog );
+ $this->assertObjectHasProperty( 'path', $blog );
+ $this->assertObjectHasProperty( 'site_id', $blog );
+ $this->assertObjectHasProperty( 'siteurl', $blog );
+ $this->assertObjectHasProperty( 'archived', $blog );
+ $this->assertObjectHasProperty( 'spam', $blog );
+ $this->assertObjectHasProperty( 'deleted', $blog );
</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"> // Mark each remaining site as spam, archived, and deleted.
</span></span></pre>
</div>
</div>
</body>
</html>