Changeset 61374

Timestamp:

12/13/2025 08:10:50 PM (9 months ago)

Author:

SergeyBiryukov

Message:

Filesystem API: Pass correct $file value to pre_unzip_file and unzip_file filters.

This commit ensures that the original $file argument passed to the function is not unintentionally overwritten by the use of the same variable name in two foreach loops.

Follow-up to [56689].

Props sanchothefat, westonruter, mukesh27, SergeyBiryukov.
Fixes #64398.

Location:

trunk

Files:

• src/wp-admin/includes/file.php (modified) (2 diffs)
• tests/phpunit/tests/filesystem/unzipFilePclzip.php (modified) (4 diffs)

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

@@ -1897 +1897 @@
 
         // Determine any children directories needed (From within the archive).
-        foreach ( $archive_files as $file ) {
-                if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.
+        foreach ( $archive_files as $archive_file ) {
+                if ( str_starts_with( $archive_file['filename'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.
                         continue;
                 }
 
-                $uncompressed_size += $file['size'];
-
-                $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname( $file['filename'] ) );
+                $uncompressed_size += $archive_file['size'];
+
+                $needed_dirs[] = $to . untrailingslashit( $archive_file['folder'] ? $archive_file['filename'] : dirname( $archive_file['filename'] ) );
         }
 
@@ -1968 +1968 @@
 
         // Extract the files from the zip.
-        foreach ( $archive_files as $file ) {
-                if ( $file['folder'] ) {
+        foreach ( $archive_files as $archive_file ) {
+                if ( $archive_file['folder'] ) {
                         continue;
                 }
-
-                if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.
+        
+                if ( str_starts_with( $archive_file['filename'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.
                         continue;
                 }
 
                 // Don't extract invalid files:
-                if ( 0 !== validate_file( $file['filename'] ) ) {
+                if ( 0 !== validate_file( $archive_file['filename'] ) ) {
                         continue;
                 }
 
-                if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE ) ) {
-                        return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+                if ( ! $wp_filesystem->put_contents( $to . $archive_file['filename'], $archive_file['content'], FS_CHMOD_FILE ) ) {
+                        return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $archive_file['filename'] );
                 }
         }

trunk/tests/phpunit/tests/filesystem/unzipFilePclzip.php

@@ -38 +38 @@
         public function test_should_apply_pre_unzip_file_filters() {
                 $filter = new MockAction();
-                add_filter( 'pre_unzip_file', array( $filter, 'filter' ) );
+                add_filter( 'pre_unzip_file', array( $filter, 'filter' ), 10, 2 );
 
                 // Prepare test environment.
@@ -54 +54 @@
                 $this->delete_folders( $unzip_destination );
 
-                $this->assertSame( 1, $filter->get_call_count() );
+                $this->assertSame( 1, $filter->get_call_count(), 'The filter should be called once.' );
+                $this->assertSame( self::$test_data_dir . 'archive.zip', $filter->get_args()[0][1], 'The $file parameter should be correct.' );
         }
 
@@ -64 +65 @@
         public function test_should_apply_unzip_file_filters() {
                 $filter = new MockAction();
-                add_filter( 'unzip_file', array( $filter, 'filter' ) );
+                add_filter( 'unzip_file', array( $filter, 'filter' ), 10, 2 );
 
                 // Prepare test environment.
@@ -80 +81 @@
                 $this->delete_folders( $unzip_destination );
 
-                $this->assertSame( 1, $filter->get_call_count() );
+                $this->assertSame( 1, $filter->get_call_count(), 'The filter should be called once.' );
+                $this->assertSame( self::$test_data_dir . 'archive.zip', $filter->get_args()[0][1], 'The $file parameter should be correct.' );
         }
 }