<!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>[53357] trunk/tests/phpunit/tests: Tests: Improve the logic of the `SECURITY.md` test to check all supported versions.</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/53357">53357</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/53357","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-05-06 11:09:54 +0000 (Fri, 06 May 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: Improve the logic of the `SECURITY.md` test to check all supported versions.
This avoids a test failure if the list of supported WordPress versions is updated before the trunk version is bumped for a new major release.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/47403">[47403]</a>, <a href="https://core.trac.wordpress.org/changeset/53347">[53347]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/55667">#55667</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsbasicphp">trunk/tests/phpunit/tests/basic.php</a></li>
<li><a href="#trunktestsphpunitteststhemephp">trunk/tests/phpunit/tests/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsbasicphp"></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/basic.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/basic.php 2022-05-05 22:01:31 UTC (rev 53356)
+++ trunk/tests/phpunit/tests/basic.php 2022-05-06 11:09:54 UTC (rev 53357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,8 +13,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $license = file_get_contents( ABSPATH . 'license.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '#Copyright 2011-(\d+) by the contributors#', $license, $matches );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this_year = gmdate( 'Y' );
- $this->assertSame( $this_year, trim( $matches[1] ), "license.txt's year needs to be updated to $this_year." );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $license_year = trim( $matches[1] );
+ $this_year = gmdate( 'Y' );
+
+ $this->assertSame( $this_year, $license_year, "license.txt's year needs to be updated to $this_year." );
</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_security_md() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,10 +24,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipOnAutomatedBranches();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $security = file_get_contents( dirname( ABSPATH ) . '/SECURITY.md' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match( '#\d.\d.x#', $security, $matches );
- $current_version = substr( $GLOBALS['wp_version'], 0, 3 );
- $latest_stable = number_format( (float) $current_version - 0.1, 1 ) . '.x';
- $this->assertSame( $latest_stable, trim( $matches[0] ), "SECURITY.md's version needs to be updated to $latest_stable." );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match_all( '#\d.\d.x#', $security, $matches );
+ $supported_versions = $matches[0];
+ $current_version = substr( $GLOBALS['wp_version'], 0, 3 );
+ $latest_stable = number_format( (float) $current_version - 0.1, 1 ) . '.x';
+
+ $this->assertContains( $latest_stable, $supported_versions, "SECURITY.md's version needs to be updated to $latest_stable." );
</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_package_json() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,11 +36,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $package_json = file_get_contents( dirname( ABSPATH ) . '/package.json' );
</span><span class="cx" style="display: block; padding: 0 10px"> $package_json = json_decode( $package_json, true );
</span><span class="cx" style="display: block; padding: 0 10px"> list( $version ) = explode( '-', $GLOBALS['wp_version'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // package.json uses x.y.z, so fill cleaned $wp_version for .0 releases.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 === substr_count( $version, '.' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $version .= '.0';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $version, $package_json['version'], "package.json's version needs to be updated to $version." );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $package_json;
</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="trunktestsphpunitteststhemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme.php 2022-05-05 22:01:31 UTC (rev 53356)
+++ trunk/tests/phpunit/tests/theme.php 2022-05-06 11:09:54 UTC (rev 53357)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,17 +221,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $path_to_readme_txt = $wp_theme->get_theme_root() . '/' . $wp_theme->get_stylesheet() . '/readme.txt';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $path_to_readme_txt );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $readme = file_get_contents( $path_to_readme_txt );
</span><span class="cx" style="display: block; padding: 0 10px"> $this_year = gmdate( 'Y' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '#Copyright (\d+) WordPress.org#', $readme, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $matches ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $this_year, trim( $matches[1] ), "Bundled themes readme.txt's year needs to be updated to $this_year." );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $readme_year = trim( $matches[1] );
+
+ $this->assertSame( $this_year, $readme_year, "Bundled themes readme.txt's year needs to be updated to $this_year." );
</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"> preg_match( '#Copyright 20\d\d-(\d+) WordPress.org#', $readme, $matches );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $matches ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $this_year, trim( $matches[1] ), "Bundled themes readme.txt's year needs to be updated to $this_year." );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $readme_year = trim( $matches[1] );
+
+ $this->assertSame( $this_year, $readme_year, "Bundled themes readme.txt's year needs to be updated to $this_year." );
</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>
</div>
</body>
</html>