Changeset 13876

Timestamp:

07/04/2024 03:47:24 AM (5 weeks ago)

Author:

dd32

Message:

Plugin Directory: Store plugin releases from trunk as trunk@1.2.3, split the releases prefilling into it's own method.

See #7696.

Location:

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

Files:

• class-plugin-directory.php (modified) (3 diffs)
• cli/class-import.php (modified) (1 diff)

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

@@ -1729 +1729 @@
         // Meta doesn't exist yet? Lets fill it out.
         if ( false === $releases || ! is_array( $releases ) ) {
-            update_post_meta( $plugin->ID, 'releases', [] );
-
-            $tags = get_post_meta( $plugin->ID, 'tags', true );
-            if ( $tags ) {
-                foreach ( $tags as $tag_version => $tag ) {
-                    self::add_release( $plugin, [
-                        'date'                   => strtotime( $tag['date'] ),
-                        'tag'                    => $tag['tag'],
-                        'version'                => $tag_version,
-                        'committer'              => [ $tag['author'] ],
-                        'zips_built'             => true, // Old release, assume they were built.
-                        'confirmations_required' => 0,    // Old release, assume it's released.
-                    ] );
-                }
-            } else {
-                // Pull from SVN directly.
-                $svn_tags = Tools\SVN::ls( "https://plugins.svn.wordpress.org/{$plugin->post_name}/tags/", true ) ?: [];
-                foreach ( $svn_tags as $entry ) {
-                    // Discard files
-                    if ( 'dir' !== $entry['kind'] ) {
-                        continue;
-                    }
-
-                    $tag = $entry['filename'];
-
-                    // Prefix the 0 for plugin versions like 0.1
-                    if ( '.' == substr( $tag, 0, 1 ) ) {
-                        $tag = "0{$tag}";
-                    }
-
-                    self::add_release( $plugin, [
-                        'date'                   => strtotime( $entry['date'] ),
-                        'tag'                    => $entry['filename'],
-                        'version'                => $tag,
-                        'committer'              => [ $entry['author'] ],
-                        'zips_built'             => true, // Old release, assume they were built.
-                        'confirmations_required' => 0,    // Old release, assume it's released.
-                    ] );
-                }
-            }
-
-            $releases = get_post_meta( $plugin->ID, 'releases', true ) ?: [];
+            $releases = self::prefill_releses_meta( $plugin );
         }
 
@@ -1789 +1748 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Fetch a specific release of the plugin, by tag.
      *
-     * @param string $plugin Plugin slug.
-     * @param string $tag    Release tag.
+     * @param string $plugin Plugin slug.
+     * @param string $ Release tag.
      * @return array|bool
      */
-    public static function get_release( $plugin, $tag ) {
+    public static function get_release( $plugin, $ ) {
         $releases = self::get_releases( $plugin );
 
+
         $filtered = wp_list_filter( $releases, compact( 'tag' ) );
-
+        if ( $filtered ) {
+            return array_shift( $filtered );
+        }
+
+        // Look for the tag as a trunk version.
+        $filtered = wp_list_filter( $releases, [ 'tag' => "trunk@{$tag}", 'version' => $tag ] );
         if ( $filtered ) {
             return array_shift( $filtered );
@@ -1836 +1854 @@
         // Fill the $release with the newish data. This could/should use wp_parse_args()?
         foreach ( $data as $k => $v ) {
-            $release[ $k ] = $v;
+            if ( is_array( $release[ $k ] ) ) {
+                $release[ $k ] = array_unique( array_merge( $release[ $k ], $v ) );
+            } else {
+                $release[ $k ] = $v;
+            }
         }
 

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

@@ -454 +454 @@
                 [
                     'tag'       => $stable_tag,
+
+
+
+
+
+
+
+
+
+
+
                     'version'   => $version,
                     'committer' => [ $last_committer ],