Changeset 55204 for trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

Timestamp:

02/03/2023 01:48:36 AM (3 years ago)

Author:

azaozz

Message:

Filesystem API: Add directory support to WP_Filesystem_Direct::move().

Introduces:

• New function: wp_opcache_invalidate_directory(), to recursively call wp_opcache_invalidate() after overwriting .php files.
• New function: move_dir(), similar to copy_dir() that uses WP_Filesystem::move() followed by wp_opcache_invalidate_directory(), and has a fallback to copy_dir().

Props: costdev, afragen, peterwilsoncc, sergeybiryukov, ironprogrammer, flixos90, bronsonquick, mukesh27, azaozz.
Fixes #57375.

File:

• trunk/src/wp-admin/includes/class-wp-filesystem-direct.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -317 +317 @@
 
     /**
-     * Moves a file.
+     * Moves a file or directory.
+     *
+     * After moving files or directories, OPcache will need to be invalidated.
+     *
+     * If moving a directory fails, `copy_dir()` can be used for a recursive copy.
+     *
+     * Use `move_dir()` for moving directories with OPcache invalidation and a
+     * fallback to `copy_dir()`.
      *
      * @since 2.5.0
@@ -332 +339 @@
         }
 
+        if ( $overwrite && $this->exists( $destination ) && ! $this->delete( $destination, true ) ) {
+            // Can't overwrite if the destination couldn't be deleted.
+            return false;
+        }
+
         // Try using rename first. if that fails (for example, source is read only) try copy.
         if ( @rename( $source, $destination ) ) {
@@ -337 +349 @@
         }
 
-        if ( $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) {
+        // Backward compatibility: Only fall back to `::copy()` for single files.
+        if ( $this->is_file( $source ) && $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) {
             $this->delete( $source );