Changeset 60997 for trunk/src/wp-admin/includes/class-plugin-upgrader.php

Timestamp:

10/20/2025 11:35:29 PM (12 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use more meaningful variable names in Plugin Upgrader.

Per the ​Naming Conventions:

Don’t abbreviate variable names unnecessarily; let the code be unambiguous and self-documenting.

This commit includes renaming of the following variables:

• $r to $upgrade_data.
• $res to $connected.
• $pluginfiles to $plugin_files — Per naming conventions, separate words via underscores.
• $info to $new_plugin_data.

Follow-up to [6779], [8550], [9141], [11005], [12157], [18618], [56525].

Props costdev, mukesh27.
See #63168.

File:

• trunk/src/wp-admin/includes/class-plugin-upgrader.php (modified) (11 diffs)

trunk/src/wp-admin/includes/class-plugin-upgrader.php

@@ -207 +207 @@
 
                 // Get the URL to the zip file.
-                $r = $current->response[ $plugin ];
+                $upgrade_data = $current->response[ $plugin ];
 
                 add_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ), 10, 2 );
@@ -224 +224 @@
                 $this->run(
                         array(
-                                'package'           => $r->package,
+                                'package'           => $upgrade_data->package,
                                 'destination'       => WP_PLUGIN_DIR,
                                 'clear_destination' => true,
@@ -302 +302 @@
 
                 // Connect to the filesystem first.
-                $res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
-                if ( ! $res ) {
+                $connected = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
+                if ( ! $connected ) {
                         $this->skin->footer();
                         return false;
@@ -342 +342 @@
 
                         // Get the URL to the zip file.
-                        $r = $current->response[ $plugin ];
+                        $upgrade_data = $current->response[ $plugin ];
 
                         $this->skin->plugin_active = is_plugin_active( $plugin );
 
-                        if ( isset( $r->requires ) && ! is_wp_version_compatible( $r->requires ) ) {
+                        if ( isset( $upgrade_data->requires ) && ! is_wp_version_compatible( $upgrade_data->requires ) ) {
                                 $result = new WP_Error(
                                         'incompatible_wp_required_version',
@@ -353 +353 @@
                                                 __( 'Your WordPress version is %1$s, however the new plugin version requires %2$s.' ),
                                                 $wp_version,
-                                                $r->requires
+                                                $upgrade_data->requires
                                         )
                                 );
@@ -360 +360 @@
                                 $this->skin->error( $result );
                                 $this->skin->after();
-                        } elseif ( isset( $r->requires_php ) && ! is_php_version_compatible( $r->requires_php ) ) {
+                        } elseif ( isset( $upgrade_data->requires_php ) && ! is_php_version_compatible( $upgrade_data->requires_php ) ) {
                                 $result = new WP_Error(
                                         'incompatible_php_required_version',
@@ -367 +367 @@
                                                 __( 'The PHP version on your server is %1$s, however the new plugin version requires %2$s.' ),
                                                 PHP_VERSION,
-                                                $r->requires_php
+                                                $upgrade_data->requires_php
                                         )
                                 );
@@ -378 +378 @@
                                 $result = $this->run(
                                         array(
-                                                'package'           => $r->package,
+                                                'package'           => $upgrade_data->package,
                                                 'destination'       => WP_PLUGIN_DIR,
                                                 'clear_destination' => true,
@@ -479 +479 @@
                 if ( $files ) {
                         foreach ( $files as $file ) {
-                                $info = get_plugin_data( $file, false, false );
-                                if ( ! empty( $info['Name'] ) ) {
-                                        $this->new_plugin_data = $info;
+                                $new_plugin_data = get_plugin_data( $file, false, false );
+                                if ( ! empty( $new_plugin_data['Name'] ) ) {
+                                        $this->new_plugin_data = $new_plugin_data;
                                         break;
                                 }
@@ -491 +491 @@
                 }
 
-                $requires_php = isset( $info['RequiresPHP'] ) ? $info['RequiresPHP'] : null;
-                $requires_wp  = isset( $info['RequiresWP'] ) ? $info['RequiresWP'] : null;
+                $requires_php = isset( $new_plugin_data['RequiresPHP'] ) ? $new_plugin_data['RequiresPHP'] : null;
+                $requires_wp  = isset( $new_plugin_data['RequiresWP'] ) ? $new_plugin_data['RequiresWP'] : null;
 
                 if ( ! is_php_version_compatible( $requires_php ) ) {
@@ -543 +543 @@
 
                 // Assume the requested plugin is the first in the list.
-                $pluginfiles = array_keys( $plugin );
-
-                return $this->result['destination_name'] . '/' . $pluginfiles[0];
+                $plugin_files = array_keys( $plugin );
+
+                return $this->result['destination_name'] . '/' . $plugin_files[0];
         }