Changeset 12532 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

Timestamp:

04/12/2023 04:50:46 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Import the Requires Plugins header on plugin import.

At present this is not used for anything, and is for future purposes.

See #6921, ​https://core.trac.wordpress.org/ticket/22316.

File:

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

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

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\Shortcodes;
 
+use WordPressdotorg\Plugin_Directory\CLI\Import;
 use WordPressdotorg\Plugin_Directory\Readme\Parser;
 use WordPressdotorg\Plugin_Directory\Plugin_Directory;
@@ -64 +65 @@
         $this->plugin_dir = Filesystem::unzip( $zip_file );
 
-        $plugin_files = Filesystem::list_files( $this->plugin_dir, true /* Recursive */, '!\.php$!i', 1 /* Depth */ );
-        foreach ( $plugin_files as $plugin_file ) {
-            $plugin_data = get_plugin_data( $plugin_file, false, false ); // No markup/translation needed.
-            if ( ! empty( $plugin_data['Name'] ) ) {
-                $this->plugin      = $plugin_data;
-                $this->plugin_root = dirname( $plugin_file );
-                break;
-            }
+        $plugin_data = (array) Import::find_plugin_headers( $this->plugin_dir, 1 /* Max Depth to search */ );
+        if ( ! empty( $plugin_data['Name'] ) ) {
+            $this->plugin      = $plugin_data;
+            $this->plugin_root = dirname( $plugin_data['PluginFile'] );
         }
 
@@ -262 +259 @@
 
         // Check for a valid readme.
-        $readme = $this->find_readme_file();
+        $readme = Import::find_readme_file( $this->plugin_root );
         if ( empty( $readme ) ) {
             $error = __( 'Error: The plugin has no readme.', 'wporg-plugins' );
@@ -381 +378 @@
                     'header_textdomain'        => $this->plugin['TextDomain'],
                     'header_description'       => $this->plugin['Description'],
+                    'requires_plugins'         => $this->plugin['RequiresPlugins'],
                     'assets_screenshots'       => array(),
                     'assets_icons'             => array(),
@@ -677 +675 @@
 
     /**
-     * Find the plugin readme file.
-     *
-     * Looks for either a readme.txt or readme.md file, prioritizing readme.txt.
-     *
-     * @return string The plugin readme.txt or readme.md filename.
-     */
-    protected function find_readme_file() {
-        $files = Filesystem::list_files( $this->plugin_root, false /* non-recursive */, '!^readme\.(txt|md)$!i' );
-
-        // Prioritize readme.txt file.
-        foreach ( $files as $file ) {
-            if ( '.txt' === strtolower( substr( $file, -4 ) ) ) {
-                return $file;
-            }
-        }
-
-        return reset( $files );
-    }
-
-    /**
      * Sends a plugin through Plugin Check.
      *