Changeset 61028

Timestamp:

10/21/2025 01:40:13 PM (3 weeks ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use more meaningful variable names in Theme 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.
• $info to $new_theme_data.

Follow-up to [8989], [11005], [13686], [18618], [20268], [57252].

Props costdev, mukesh27.
See #63168.

File:

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

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

@@ -312 +312 @@
         }
 
-        $r = $current->response[ $theme ];
+        $upgrade_data = $current->response[ $theme ];
 
         add_filter( 'upgrader_pre_install', array( $this, 'current_before' ), 10, 2 );
@@ -324 +324 @@
         $this->run(
             array(
-                'package'           => $r['package'],
+                'package'           => $upgrade_data['package'],
                 'destination'       => get_theme_root( $theme ),
                 'clear_destination' => true,
@@ -401 +401 @@
 
         // Connect to the filesystem first.
-        $res = $this->fs_connect( array( WP_CONTENT_DIR ) );
-        if ( ! $res ) {
+        $connected = $this->fs_connect( array( WP_CONTENT_DIR ) );
+        if ( ! $connected ) {
             $this->skin->footer();
             return false;
@@ -442 +442 @@
 
             // Get the URL to the zip file.
-            $r = $current->response[ $theme ];
-
-            if ( isset( $r['requires'] ) && ! is_wp_version_compatible( $r['requires'] ) ) {
+            $upgrade_data = $current->response[ $theme ];
+
+            if ( isset( $upgrade_data['requires'] ) && ! is_wp_version_compatible( $upgrade_data['requires'] ) ) {
                 $result = new WP_Error(
                     'incompatible_wp_required_version',
@@ -451 +451 @@
                         __( 'Your WordPress version is %1$s, however the new theme version requires %2$s.' ),
                         $wp_version,
-                        $r['requires']
+                        $upgrade_data['requires']
                     )
                 );
@@ -458 +458 @@
                 $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',
@@ -465 +465 @@
                         __( 'The PHP version on your server is %1$s, however the new theme version requires %2$s.' ),
                         PHP_VERSION,
-                        $r['requires_php']
+                        $upgrade_data['requires_php']
                     )
                 );
@@ -476 +476 @@
                 $result = $this->run(
                     array(
-                        'package'           => $r['package'],
+                        'package'           => $upgrade_data['package'],
                         'destination'       => get_theme_root( $theme ),
                         'clear_destination' => true,
@@ -590 +590 @@
 
         // All these headers are needed on Theme_Installer_Skin::do_overwrite().
-        $info = get_file_data(
+        $new_theme_data = get_file_data(
             $working_directory . 'style.css',
             array(
@@ -602 +602 @@
         );
 
-        if ( empty( $info['Name'] ) ) {
+        if ( empty( $new_theme_data['Name'] ) ) {
             return new WP_Error(
                 'incompatible_archive_theme_no_name',
@@ -620 +620 @@
          */
         if (
-            empty( $info['Template'] ) &&
+            empty( $new_theme_data['Template'] ) &&
             ! file_exists( $working_directory . 'index.php' ) &&
             ! file_exists( $working_directory . 'templates/index.html' ) &&
@@ -640 +640 @@
         }
 
-        $requires_php = isset( $info['RequiresPHP'] ) ? $info['RequiresPHP'] : null;
-        $requires_wp  = isset( $info['RequiresWP'] ) ? $info['RequiresWP'] : null;
+        $requires_php = isset( $new_theme_data['RequiresPHP'] ) ? $new_theme_data['RequiresPHP'] : null;
+        $requires_wp  = isset( $new_theme_data['RequiresWP'] ) ? $new_theme_data['RequiresWP'] : null;
 
         if ( ! is_php_version_compatible( $requires_php ) ) {
@@ -664 +664 @@
         }
 
-        $this->new_theme_data = $info;
+        $this->new_theme_data = $new_theme_data;
 
         return $source;