Changeset 51899

Timestamp:

10/09/2021 03:37:41 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Introduce a move_dir() function.

This replaces the copy_dir() usage in WP_Upgrader::install_package() and aims to avoid PHP timeout issues when installing or updating large plugins on slower systems like Vagrant or the WP Docker test environment.

The new function attempts a native PHP rename() function first and falls back to the previous copy_dir().

Follow-up to [51815], [51898].

Props afragen, aristath, peterwilsoncc, galbaras, noisysocks, pbiron.
Fixes #54166. See #51857.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-upgrader.php (modified) (1 diff)
• file.php (modified) (1 diff)

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

@@ -624 +624 @@
         }
 
-        // Copy new version of item into place.
-        $result = copy_dir( $source, $remote_destination );
+        // Move new version of item into place.
+        $result = move_dir( $source, $remote_destination );
         if ( is_wp_error( $result ) ) {
             if ( $args['clear_working'] ) {

trunk/src/wp-admin/includes/file.php

@@ -1919 +1919 @@
 
 /**
+ * Moves a directory from one location to another via the rename() PHP function.
+ * If the renaming failed, falls back to copy_dir().
+ *
+ * Assumes that WP_Filesystem() has already been called and setup.
+ *
+ * @since 5.9.0
+ *
+ * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+ *
+ * @param string $from Source directory.
+ * @param string $to   Destination directory.
+ * @return true|WP_Error True on success, WP_Error on failure.
+ */
+function move_dir( $from, $to ) {
+    global $wp_filesystem;
+
+    $wp_filesystem->rmdir( $to );
+    if ( @rename( $from, $to ) ) {
+        return true;
+    }
+
+    $wp_filesystem->mkdir( $to );
+    $result = copy_dir( $from, $to );
+
+    return $result;
+}
+
+/**
  * Initializes and connects the WordPress Filesystem Abstraction classes.
  *