Changeset 13365

Timestamp:

03/20/2024 06:39:08 AM (4 months ago)

Author:

dd32

Message:

Plugin Directory: Blueprint import: Normalize installPlugin/installTheme by url to install-by-slug for WordPress.org items.

This avoids cases of the blueprint referencing an outdated version of the plugin, and attempting to install the plugin twice.

See #7487.

File:

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

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

@@ -1156 +1156 @@
             $has_self_install_step = false;
             if ( isset( $decoded_file[ 'steps' ] ) ) {
-                foreach ( $decoded_file[ 'steps' ] as $i => $step ) {
-                    if ( 'installPlugin' === $step['step']
-                        && $plugin_slug === $step['pluginZipFile']['slug'] ) {
+                foreach ( $decoded_file[ 'steps' ] as &$step ) {
+                    // Normalize a "install plugin from url" to a install-by-slug.
+                    if (
+                        'installPlugin' === $step['step'] &&
+                        isset( $step['pluginZipFile']['url'] ) &&
+                        preg_match( '!^https?://downloads\.wordpress\.org/plugin/(?P<slug>[a-z0-9-_]+)(\.(?P<version>.+?))?\.zip($|[?])!i', $step['pluginZipFile']['url'], $m )
+                    ) {
+                        $step[ 'pluginZipFile' ] = [
+                            'resource' => 'wordpress.org/plugins',
+                            'slug'     => $m['slug']
+                        ];
+                    }
+
+                    // Normalise a "install theme from url" to a install-by-slug.
+                    if (
+                        'installTheme' === $step['step'] &&
+                        isset( $step['themeZipFile']['url'] ) &&
+                        preg_match( '!^https?://downloads\.wordpress\.org/theme/(?P<slug>[a-z0-9-_]+)(\.(?P<version>.+?))?\.zip($|[?])!i', $step['themeZipFile']['url'], $m )
+                    ) {
+                        $step[ 'themeZipFile' ] = [
+                            'resource' => 'wordpress.org/themes',
+                            'slug'     => $m['slug']
+                        ];
+                    }
+
+                    // Check if this is a "install this plugin" step.
+                    if (
+                        'installPlugin' === $step['step'] &&
+                        isset( $step['pluginZipFile']['slug'] ) &&
+                        $plugin_slug === $step['pluginZipFile']['slug']
+                    ) {
                         $has_self_install_step = true;
 
                         if ( true != $step['options']['activate'] ) {
-                            $decoded_file[ 'steps' ][ $i ][ 'options' ][ 'activate' ] = true;
+                            $[ 'options' ][ 'activate' ] = true;
                         }
                     }
@@ -1169 +1197 @@
 
             // Akismet is a special case because the plugin is bundled with WordPress.
-            if ( !$has_self_install_step && 'akismet' !== $plugin_slug ) {
+            if ( !$has_self_install_step && 'akismet' !== $plugin_slug ) {
                 $decoded_file['steps'][] = array(
                     'step' => 'installPlugin',