<!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>[54077] trunk/tests/phpunit/tests/rewrite: Tests: Correct the cache invalidation tests for old date or slug redirect.</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/54077">54077</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/54077","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-09-06 00:59:17 +0000 (Tue, 06 Sep 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'>Tests: Correct the cache invalidation tests for old date or slug redirect.
This affects:
* `Tests_Rewrite_OldDateRedirect::test_old_date_redirect_cache_invalidation()`
* `Tests_Rewrite_OldSlugRedirect::test_old_slug_redirect_cache_invalidation()`
In the former test, the `$post_id` property is declared as `static`, so can only be approached as static, even when used within the same class in which the property is declared.
Using non-static access will result in `null`. See: https://3v4l.org/93HQL
This PHP notice was hidden so far, due to the existence of magic methods in the `WP_UnitTestCase_Base class`.
All the same, the magic methods as they were, would also return `null` for this property. All in all, the post being updated for this test would never get the correct `post_id`.
Fixed by using static access to approach the `static` property.
On a related note, the described bug fix (using the actual `$post_id` instead of `null`) exposed that this test was as a matter of fact failing. This was just hidden by the first bug.
Based on the original commit introducing the test, an adjustment is now made which appears to be what the test actually ''intended'' to test. A similar change is made to the cache invalidation test for old slug redirects. While not strictly required, it brings some consistency between the two tests and ensures that both tests use a unique `post_name` value to avoid collisions with the previous values.
This bug was discovered while fixing (removing) the magic methods in the `WP_UnitTestCase_Base` class in an effort to improve compatibility with PHP 8.2.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/53549">[53549]</a>.
Props jrf, costdev, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsrewriteoldDateRedirectphp">trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php</a></li>
<li><a href="#trunktestsphpunittestsrewriteoldSlugRedirectphp">trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsrewriteoldDateRedirectphp"></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/rewrite/oldDateRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php 2022-09-06 00:11:20 UTC (rev 54076)
+++ trunk/tests/phpunit/tests/rewrite/oldDateRedirect.php 2022-09-06 00:59:17 UTC (rev 54077)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,9 +106,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = user_trailingslashit( get_permalink( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( $old_permalink );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="cx" style="display: block; padding: 0 10px"> $num_queries = get_num_queries();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_date_redirect_url );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_date_redirect_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, get_num_queries() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +120,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36723
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_old_date_redirect_cache_invalidation() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
</del><span class="cx" style="display: block; padding: 0 10px"> $old_permalink = user_trailingslashit( get_permalink( self::$post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2004-01-03 00:00:00';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,15 +141,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time = '2014-02-01 00:00:00';
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => $this->post_id,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => self::$post_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_date' => $time,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_date_gmt' => get_gmt_from_date( $time ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_name' => 'bar-baz',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_name' => 'foo-bar-baz',
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $permalink = user_trailingslashit( get_permalink( self::$post_id ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $num_queries = get_num_queries();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->go_to( $permalink );
</del><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_date_redirect_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertGreaterThan( $num_queries, get_num_queries() );
</span></span></pre></div>
<a id="trunktestsphpunittestsrewriteoldSlugRedirectphp"></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/rewrite/oldSlugRedirect.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2022-09-06 00:11:20 UTC (rev 54076)
+++ trunk/tests/phpunit/tests/rewrite/oldSlugRedirect.php 2022-09-06 00:59:17 UTC (rev 54077)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="cx" style="display: block; padding: 0 10px"> $num_queries = get_num_queries();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_slug_redirect_url );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_slug_redirect_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $num_queries, get_num_queries() );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,9 +102,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $this->post_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_name' => 'foo-bar',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_name' => 'foo-bar-baz',
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $permalink = user_trailingslashit( get_permalink( $this->post_id ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $num_queries = get_num_queries();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_old_slug_redirect();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $permalink, $this->old_slug_redirect_url );
</span></span></pre>
</div>
</div>
</body>
</html>