Changeset 9050

Timestamp:

07/16/2019 05:55:10 AM (5 years ago)

Author:

dd32

Message:

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 #4514.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• cli/class-import.php (modified) (4 diffs)
• readme/class-validator.php (modified) (7 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -26 +26 @@
     public $readme_fields = array(
         'tested',
-        'requires',
-        'requires_php',
         'donate_link',
         'license',
@@ -33 +31 @@
         'upgrade_notice',
         'screenshots',
+
+        // These headers are stored as post meta, but are handled separately.
+        // 'requires',
+        // 'requires_php',
     );
 
@@ -40 +42 @@
         'Name'       => 'header_name',
         'PluginURI'  => 'header_plugin_uri',
-        'Version'    => 'version',
         'Author'     => 'header_author',
         'AuthorURI'  => 'header_author_uri',
         'TextDomain' => 'header_textdomain',
+
+        // These headers are stored in these fields, but are handled separately.
+        // 'Version'     => 'version',
+        // 'RequiresWP'  => 'requires',
+        // 'RequiresPHP' => 'requires_php',
     );
 
@@ -147 +153 @@
         }
 
+        // Store the plugin headers we need. Note that 'Version', 'RequiresWP', and 'RequiresPHP' are handled below.
         foreach ( $this->plugin_headers as $plugin_header => $meta_field ) {
-            if ( 'Version' == $plugin_header ) {
-                continue; // We'll specifically update the latest version after everything is built.
-            }
             update_post_meta( $plugin->ID, $meta_field, ( isset( $headers->$plugin_header ) ? wp_slash( $headers->$plugin_header ) : '' ) );
         }
 
-        update_post_meta( $plugin->ID, 'tagged_versions', wp_slash( $tagged_versions ) );
-        update_post_meta( $plugin->ID, 'sections', wp_slash( array_keys( $readme->sections ) ) );
+        // 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 ) ) );
         update_post_meta( $plugin->ID, 'assets_screenshots', wp_slash( $assets['screenshot'] ) );
-        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 ) );
+        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 ) );
 
         // Calculate the 'plugin color' from the average color of the banner if provided. This is used for fallback icons.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/readme/class-validator.php

@@ -86 +86 @@
                 '<code>' . number_format( $latest_wordpress_version - 0.1, 1 ) . '</code>'
             );
-        } elseif ( empty( $readme->requires ) ) {
-            $warnings[] = sprintf(
-                /* translators: %s: plugin header tag */
-                __( 'The %s field is missing.', 'wporg-plugins' ),
-                '<code>Requires at least</code>'
-            );
         }
 
@@ -120 +114 @@
                 '<code>7.0</code>'
             );
-        } elseif ( empty( $readme->requires_php ) ) {
-            $warnings[] = sprintf(
-                /* translators: %s: plugin header tag */
-                __( 'The %s field is missing.', 'wporg-plugins' ),
-                '<code>Requires PHP</code>'
-            );
         }
+
         if ( empty( $readme->stable_tag ) ) {
             $warnings[] = sprintf(
@@ -152 +141 @@
 
         // Notes.
+        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>'
+            );
+        }
+
         if ( empty( $readme->sections['faq'] ) ) {
             $notes[] = sprintf(
@@ -159 +164 @@
             );
         }
+
         if ( empty( $readme->sections['changelog'] ) ) {
             $notes[] = sprintf(
@@ -166 +172 @@
             );
         }
+
         if ( empty( $readme->upgrade_notice ) ) {
             $notes[] = sprintf(
@@ -173 +180 @@
             );
         }
+
         if ( empty( $readme->screenshots ) ) {
             $notes[] = sprintf(
@@ -180 +188 @@
             );
         }
+
         if ( empty( $readme->donate_link ) ) {
             $notes[] = __( 'No donate link was found', 'wporg-plugins' );