<!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>[9050] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory: Plugin Directory: Preference the `Requires PHP` and `Requires at least` headers defined in the Plugins `.php` header over the `readme.txt` values.</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="http://meta.trac.wordpress.org/changeset/9050">9050</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9050","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-07-16 05:55:10 +0000 (Tue, 16 Jul 2019)</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'>Plugin Directory: Preference the `Requires PHP` and `Requires at least` headers defined in the Plugins `.php` header over the `readme.txt` values.
This also moves the missing fields in the readme.txt to being notes rather than warnings in the readme validator.
This matches the behaviour in WordPress 5.3, see #WP46938.
Fixes <a href="http://meta.trac.wordpress.org/ticket/4514">#4514</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryreadmeclassvalidatorphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorycliclassimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2019-07-16 02:58:04 UTC (rev 9049)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php 2019-07-16 05:55:10 UTC (rev 9050)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,13 +25,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Readme fields which get stored in plugin meta
</span><span class="cx" style="display: block; padding: 0 10px"> public $readme_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tested',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'requires',
- 'requires_php',
</del><span class="cx" style="display: block; padding: 0 10px"> 'donate_link',
</span><span class="cx" style="display: block; padding: 0 10px"> 'license',
</span><span class="cx" style="display: block; padding: 0 10px"> 'license_uri',
</span><span class="cx" style="display: block; padding: 0 10px"> 'upgrade_notice',
</span><span class="cx" style="display: block; padding: 0 10px"> 'screenshots',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // These headers are stored as post meta, but are handled separately.
+ // 'requires',
+ // 'requires_php',
</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"> // Plugin headers that are stored in plugin meta
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,10 +41,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Header => meta_key
</span><span class="cx" style="display: block; padding: 0 10px"> 'Name' => 'header_name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'PluginURI' => 'header_plugin_uri',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Version' => 'version',
</del><span class="cx" style="display: block; padding: 0 10px"> 'Author' => 'header_author',
</span><span class="cx" style="display: block; padding: 0 10px"> 'AuthorURI' => 'header_author_uri',
</span><span class="cx" style="display: block; padding: 0 10px"> 'TextDomain' => 'header_textdomain',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // These headers are stored in these fields, but are handled separately.
+ // 'Version' => 'version',
+ // 'RequiresWP' => 'requires',
+ // 'RequiresPHP' => 'requires_php',
</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">@@ -146,20 +152,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, $readme_field, wp_slash( $value ) );
</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">+ // Store the plugin headers we need. Note that 'Version', 'RequiresWP', and 'RequiresPHP' are handled below.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->plugin_headers as $plugin_header => $meta_field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'Version' == $plugin_header ) {
- continue; // We'll specifically update the latest version after everything is built.
- }
</del><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, $meta_field, ( isset( $headers->$plugin_header ) ? wp_slash( $headers->$plugin_header ) : '' ) );
</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">- update_post_meta( $plugin->ID, 'tagged_versions', wp_slash( $tagged_versions ) );
- update_post_meta( $plugin->ID, 'sections', wp_slash( array_keys( $readme->sections ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update the Requires and Requires PHP fields, prefering those from the Plugin Headers.
+ // Unfortunately the value within $headers is not always a well-formed value.
+ $requires = $readme->requires;
+ $requires_php = $readme->requires_php;
+ if ( $headers->RequiresWP && preg_match( '!^[\d.]{3,}$!', $headers->RequiresWP ) ) {
+ $requires = $headers->RequiresWP;
+ }
+ if ( $headers->RequiresPHP && preg_match( '!^[\d.]{3,}$!', $headers->RequiresPHP ) ) {
+ $requires_php = $headers->RequiresPHP;
+ }
+
+ update_post_meta( $plugin->ID, 'requires', wp_slash( $requires ) );
+ update_post_meta( $plugin->ID, 'requires_php', wp_slash( $requires_php ) );
+ update_post_meta( $plugin->ID, 'tagged_versions', wp_slash( $tagged_versions ) );
+ update_post_meta( $plugin->ID, 'sections', wp_slash( array_keys( $readme->sections ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $plugin->ID, 'assets_screenshots', wp_slash( $assets['screenshot'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $plugin->ID, 'assets_icons', wp_slash( $assets['icon'] ) );
- update_post_meta( $plugin->ID, 'assets_banners', wp_slash( $assets['banner'] ) );
- update_post_meta( $plugin->ID, 'last_updated', wp_slash( $plugin->post_modified_gmt ) );
- update_post_meta( $plugin->ID, 'plugin_status', wp_slash( $plugin->post_status ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_meta( $plugin->ID, 'assets_icons', wp_slash( $assets['icon'] ) );
+ update_post_meta( $plugin->ID, 'assets_banners', wp_slash( $assets['banner'] ) );
+ update_post_meta( $plugin->ID, 'last_updated', wp_slash( $plugin->post_modified_gmt ) );
+ update_post_meta( $plugin->ID, 'plugin_status', wp_slash( $plugin->post_status ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Calculate the 'plugin color' from the average color of the banner if provided. This is used for fallback icons.
</span><span class="cx" style="display: block; padding: 0 10px"> $banner_average_color = '';
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryreadmeclassvalidatorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php 2019-07-16 02:58:04 UTC (rev 9049)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php 2019-07-16 05:55:10 UTC (rev 9050)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,12 +85,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . number_format( $latest_wordpress_version, 1 ) . '</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>' . number_format( $latest_wordpress_version - 0.1, 1 ) . '</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( empty( $readme->requires ) ) {
- $warnings[] = sprintf(
- /* translators: %s: plugin header tag */
- __( 'The %s field is missing.', 'wporg-plugins' ),
- '<code>Requires at least</code>'
- );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $readme->warnings['tested_header_ignored'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,13 +113,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>5.2.4</code>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>7.0</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( empty( $readme->requires_php ) ) {
- $warnings[] = sprintf(
- /* translators: %s: plugin header tag */
- __( 'The %s field is missing.', 'wporg-plugins' ),
- '<code>Requires PHP</code>'
- );
</del><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"> if ( empty( $readme->stable_tag ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $warnings[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: 'Stable tag', 2: /trunk/ SVN directory, 3: 'Stable tag: trunk' */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,6 +140,22 @@
</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"> // Notes.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $readme->requires ) ) {
+ $notes[] = sprintf(
+ /* translators: %s: plugin header tag */
+ __( 'The %s field is missing. It should be defined here, or in your main plugin file.', 'wporg-plugins' ),
+ '<code>Requires at least</code>'
+ );
+ }
+
+ if ( empty( $readme->requires_php ) ) {
+ $notes[] = sprintf(
+ /* translators: %s: plugin header tag */
+ __( 'The %s field is missing. It should be defined here, or in your main plugin file.', 'wporg-plugins' ),
+ '<code>Requires PHP</code>'
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $readme->sections['faq'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notes[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: section title */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,6 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>== Frequently Asked Questions ==</code>'
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $readme->sections['changelog'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notes[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: section title */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,6 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>== Changelog ==</code>'
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $readme->upgrade_notice ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notes[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: section title */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,6 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>== Upgrade Notice ==</code>'
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $readme->screenshots ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notes[] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: section title */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,6 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>== Screenshots ==</code>'
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $readme->donate_link ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notes[] = __( 'No donate link was found', 'wporg-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>