Changeset 13637

Timestamp:

05/01/2024 01:51:39 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Support the Tested Up To header in the main plugin file.

This is as the other similar metadata fields are preferred from the plugin file, so it makes sense to have all versions co-located.

Fixes #4621.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (7 diffs)

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

@@ -29 +29 @@
         // Readme fields which get stored in plugin meta
         public $readme_fields = array(
-                'tested',
                 'donate_link',
                 'license',
@@ -37 +36 @@
 
                 // These headers are stored as post meta, but are handled separately.
+                // 'tested',
                 // 'requires',
                 // 'requires_php',
@@ -320 +320 @@
                 }
 
-                // Update the tested-up-to value
-                $tested = $readme->tested;
-                if ( function_exists( 'wporg_get_version_equivalents' ) ) {
-                        foreach ( wporg_get_version_equivalents() as $latest_compatible_version => $compatible_with ) {
-                                if ( in_array( $readme->tested, $compatible_with, true ) ) {
-                                        $tested = $latest_compatible_version;
-                                        break;
-                                }
-                        }
-                }
-
                 // Update all readme meta
                 foreach ( $this->readme_fields as $readme_field ) {
-                        $value = ( 'tested' == $readme_field ) ? $tested : $readme->$readme_field;
-                        update_post_meta( $plugin->ID, $readme_field, wp_slash( $value ) );
+                        update_post_meta( $plugin->ID, $readme_field, wp_slash( $readme->$readme_field ) );
                 }
 
@@ -342 +330 @@
                 }
 
-                // Update the Requires and Requires PHP fields, prefering those from the Plugin Headers.
+                // Update the Requires, Requires PHP, and Tested up to 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;
+                $tested       = $readme->tested;
                 if ( $headers->RequiresWP && preg_match( '!^[\d.]{3,}$!', $headers->RequiresWP ) ) {
                         $requires = $headers->RequiresWP;
@@ -351 +340 @@
                 if ( $headers->RequiresPHP && preg_match( '!^[\d.]{3,}$!', $headers->RequiresPHP ) ) {
                         $requires_php = $headers->RequiresPHP;
+                }
+                if ( $headers->TestedUpTo && preg_match( '!^[\d.]{3,}$!', $headers->TestedUpTo ) ) {
+                        $tested = $headers->TestedUpTo;
+                }
+
+                // Sanitize the tested version.
+                if ( function_exists( 'wporg_get_version_equivalents' ) ) {
+                        foreach ( wporg_get_version_equivalents() as $latest_compatible_version => $compatible_with ) {
+                                if ( in_array( $tested, $compatible_with, true ) ) {
+                                        $tested = $latest_compatible_version;
+                                        break;
+                                }
+                        }
                 }
 
@@ -364 +366 @@
                 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, 'tested',             wp_slash( $tested ) );
                 update_post_meta( $plugin->ID, 'tagged_versions',    wp_slash( array_keys( $tagged_versions ) ) );
                 update_post_meta( $plugin->ID, 'sections',           wp_slash( array_keys( $readme->sections ) ) );
@@ -973 +976 @@
                 if ( ! isset( $headers['RequiresPlugins'] ) ) {
                         $headers['RequiresPlugins'] = 'Requires Plugins';
+                }
+                // https://meta.trac.wordpress.org/ticket/4621
+                if ( ! isset( $headers['TestedUpTo'] ) ) {
+                        $headers['TestedUpTo'] = 'Tested up to';
                 }