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

Timestamp:

04/03/2024 07:01:21 AM (6 months ago)

Author:

dd32

Message:

Plugin Directory: Store error codes (rather than english error messages) that occur during a plugin import, to allow the errors to be generated with the appropriate translations.

This expands some errors to better highlight what is invalid as well.

See #6108.

File:

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

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

@@ -106 +106 @@
         // If the readme generated any warnings, raise it to self::$import_warnings;
         if ( $readme->warnings ) {
-            // Convert the warnings to a human readable format.
-            $readme_warnings = Readme_Validator::instance()->validate_content( $readme->raw_contents );
-
-            foreach ( [ 'errors', 'warnings' ] as $field ) {
-                foreach ( $readme_warnings[ $field ] ?? [] as $warning ) {
-                    $this->warnings[] = "Readme: {$warning}";
-                }
-            }
+            $this->warnings = array_merge( $this->warnings, $readme->warnings );
         }
 
@@ -128 +121 @@
             $update_uri_valid = preg_match( '!^(https?://)?(wordpress.org|w.org)/plugins?/(?P<slug>[^/]+)/?$!i', $headers->UpdateURI, $update_uri_matches );
             if ( ! $update_uri_valid || $update_uri_matches['slug'] !== $plugin_slug ) {
-                $this->warnings['invalid_update_uri'] = 'Invalid Update URI header detected: ' . $headers->UpdateURI;
-
-                throw new Exception( $this->warnings['invalid_update_uri'] );
+                $this->warnings['invalid_update_uri'] = $headers->UpdateURI;
+
+                throw new Exception( Readme_Validator::instance()->translate_code_to_message( 'invalid_update_uri' ) );
             }
         }
@@ -153 +146 @@
 
         if ( $unmet_dependencies ) {
-            $this->warnings['unmet_dependencies'] = 'Invalid plugin dependencies specified. The following dependencies could not be resolved: ' . implode( ', ', $requires_plugins_unmet );
-
-            throw new Exception( $this->warnings['unmet_dependencies'] );
+            $this->warnings['unmet_dependencies'] = $requires_plugins_unmet;
+
+            throw new Exception( Readme_Validator::instance()->translate_code_to_message( 'unmet_dependencies', $requires_plugins_unmet ) );
         }
         unset( $_requires_plugins, $unmet_dependencies );
@@ -1169 +1162 @@
                     }
 
-                    // Normalise a "install theme from url" to a install-by-slug.
+                    // Normalize a "install theme from url" to a install-by-slug.
                     if (
                         'installTheme' === $step['step'] &&
@@ -1210 +1203 @@
             }
 
-
             $contents = json_encode( $decoded_file ); // Re-encode to minimize whitespace
         }