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

Timestamp:

07/04/2024 03:08:32 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Always add the release metadata for plugin releases from tags.

See #7696.

File:

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

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

@@ -95 +95 @@
                 $assets             = $data['assets'];
                 $headers            = $data['plugin_headers'];
+                $version            = $headers->Version ?? '';
                 $stable_tag         = $data['stable_tag'];
                 $last_committer     = $data['last_committer'];
@@ -168 +169 @@
                                 if ( ! $release ) {
                                         // Use the actual version for stable releases, otherwise fallback to the tag name, as we don't have the actual header data.
-                                        $version = ( $svn_changed_tag === $stable_tag ) ? $headers->Version : $svn_changed_tag;
+                                        $version = ( $svn_changed_tag === $stable_tag ) ? $version : $svn_changed_tag;
 
                                         Plugin_Directory::add_release(
@@ -298 +299 @@
                  */
                 if (
-                        ( ! isset( $headers->Version ) || $headers->Version != get_post_meta( $plugin->ID, 'version', true ) ) ||
+                        ( ! $version || $version != get_post_meta( $plugin->ID, 'version', true ) ) ||
                         $plugin->post_modified == '0000-00-00 00:00:00' ||
                         ( $svn_changed_tags && in_array( ( $stable_tag ?: 'trunk' ), $svn_changed_tags, true ) )
@@ -437 +438 @@
                 }
 
+                // Add the release to storage.
+                if ( 'trunk' != $stable_tag ) {
+                        Plugin_Directory::add_release(
+                                $plugin,
+                                [
+                                        'tag'       => $stable_tag,
+                                        'version'   => $version,
+                                        'committer' => [ $last_committer ],
+                                        'revision'  => [ $last_revision ]
+                                ]
+                        );
+                }
+
                 $this->rebuild_affected_zips( $plugin_slug, $stable_tag, $current_stable_tag, $svn_changed_tags, $svn_revision_triggered );
 
                 // Finally, set the new version live.
                 update_post_meta( $plugin->ID, 'stable_tag', wp_slash( $stable_tag ) );
-                update_post_meta( $plugin->ID, 'version',    wp_slash( $headers->Version ) );
+                update_post_meta( $plugin->ID, 'version',    wp_slash( $version ) );
                 // Update the list of tags last, as it controls which ZIPs are present in the 'Previous versions' section and info API.
                 update_post_meta( $plugin->ID, 'tags',       wp_slash( $tagged_versions ) );
@@ -512 +526 @@
                                 ) {
                                         unset( $versions_to_build[ $i ] );
-                                } else {
-                                        $release['zips_built'] = true;
-                                        Plugin_Directory::add_release( $plugin, $release );
                                 }
                         }
@@ -541 +552 @@
                 } catch ( Exception $e ) {
                         return false;
+                }
+
+                // Mark the ZIPs as being built.
+                foreach ( $versions_to_build as $tag ) {
+                        if ( 'trunk' === $tag ) {
+                                continue;
+                        }
+
+                        Plugin_Directory::add_release(
+                                $plugin,
+                                [
+                                        'tag'        => $tag,
+                                        'zips_built' => true
+                                ]
+                        );
                 }