Merge branch 'WordPress:trunk' into trunk

Author: dd32

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

@@ -139,8 +139,8 @@ public function chgrp( $file, $group, $recursive = false ) {
 		$file     = trailingslashit( $file );
 		$filelist = $this->dirlist( $file );
 
-		foreach ( $filelist as $filename ) {
-			$this->chgrp( $file . $filename, $group, $recursive );
+		foreach ( $filelist as $file_listing ) {
+			$this->chgrp( $file . $file_listing['name'], $group, $recursive );
 		}
 
 		return true;
@@ -227,8 +227,8 @@ public function chown( $file, $owner, $recursive = false ) {
 		// Is a directory, and we want recursive.
 		$filelist = $this->dirlist( $file );
 
-		foreach ( $filelist as $filename ) {
-			$this->chown( $file . '/' . $filename, $owner, $recursive );
+		foreach ( $filelist as $file_listing ) {
+			$this->chown( $file . '/' . $file_listing['name'], $owner, $recursive );
 		}
 
 		return true;

tests/phpunit/tests/filesystem/wpFilesystemDirect/base.php

@@ -17,7 +17,7 @@ abstract class WP_Filesystem_Direct_UnitTestCase extends WP_UnitTestCase {
 	/**
 	 * The file structure for tests.
 	 *
-	 * @var array
+	 * @var array<string, array{type: string, path: string, contents?: string}>
 	 */
 	protected static $file_structure = array();
 

tests/phpunit/tests/filesystem/wpFilesystemDirect/chgrp.php

@@ -29,4 +29,36 @@ class Tests_Filesystem_WpFilesystemDirect_Chgrp extends WP_Filesystem_Direct_Uni
 	public function test_should_fail_to_change_file_group( $path ) {
 		$this->assertFalse( self::$filesystem->chgrp( self::$file_structure['test_dir']['path'] . $path, 0 ) );
 	}
+
+	/**
+	 * Tests that recursive {@see WP_Filesystem_Direct::chgrp()} descends into subdirectories.
+	 *
+	 * The resulting group cannot be asserted without elevated privileges, so recursion is
+	 * verified by recording the paths passed to {@see WP_Filesystem_Direct::chgrp()}. Changing each item to its current
+	 * group is a permitted no-op that avoids requiring root and its "Operation not permitted" warning.
+	 *
+	 * @ticket 65584
+	 */
+	public function test_should_recurse_into_subdirectories(): void {
+		$directory   = untrailingslashit( self::$file_structure['test_dir']['path'] );
+		$nested_file = self::$file_structure['subfile']['path'];
+
+		$spy = new class( null ) extends WP_Filesystem_Direct {
+			/** @var string[] */
+			public array $visited = array();
+
+			public function chgrp( $file, $group, $recursive = false ) {
+				$this->visited[] = $file;
+				return parent::chgrp( $file, $group, $recursive );
+			}
+		};
+
+		$spy->chgrp( $directory, (int) filegroup( $directory ), true );
+
+		$this->assertContains(
+			$nested_file,
+			$spy->visited,
+			'chgrp() did not recurse into the nested subdirectory.'
+		);
+	}
 }

tests/phpunit/tests/filesystem/wpFilesystemDirect/chmod.php

@@ -74,4 +74,31 @@ public function data_should_set_mode_when_not_passed() {
 			),
 		);
 	}
+
+	/**
+	 * Tests that recursive {@see WP_Filesystem_Direct::chmod()} applies the mode to files in subdirectories.
+	 *
+	 * @ticket 65584
+	 */
+	public function test_should_change_mode_recursively(): void {
+		if ( self::is_windows() ) {
+			$this->markTestSkipped( 'chmod() does not support octal modes on Windows.' );
+		}
+
+		$directory   = untrailingslashit( self::$file_structure['test_dir']['path'] );
+		$nested_file = self::$file_structure['subfile']['path'];
+
+		$this->assertTrue(
+			self::$filesystem->chmod( $directory, 0640, true ),
+			'chmod() did not report success.'
+		);
+
+		clearstatcache();
+
+		$this->assertSame(
+			'640',
+			self::$filesystem->getchmod( $nested_file ),
+			'The mode was not applied to a file in a nested subdirectory.'
+		);
+	}
 }

tests/phpunit/tests/filesystem/wpFilesystemDirect/chown.php

@@ -29,4 +29,36 @@ class Tests_Filesystem_WpFilesystemDirect_Chown extends WP_Filesystem_Direct_Uni
 	public function test_should_return_false( $path ) {
 		$this->assertFalse( self::$filesystem->chown( $path, fileowner( __FILE__ ) ) );
 	}
+
+	/**
+	 * Tests that recursive {@see WP_Filesystem_Direct::chown()} descends into subdirectories.
+	 *
+	 * The resulting owner cannot be asserted without elevated privileges, so recursion is
+	 * verified by recording the paths passed to {@see WP_Filesystem_Direct::chown()}. Changing each item to its current
+	 * owner is a permitted no-op that avoids requiring root and its "Operation not permitted" warning.
+	 *
+	 * @ticket 65584
+	 */
+	public function test_should_recurse_into_subdirectories(): void {
+		$directory   = untrailingslashit( self::$file_structure['test_dir']['path'] );
+		$nested_file = self::$file_structure['subfile']['path'];
+
+		$spy = new class( null ) extends WP_Filesystem_Direct {
+			/** @var string[] */
+			public array $visited = array();
+
+			public function chown( $file, $owner, $recursive = false ) {
+				$this->visited[] = $file;
+				return parent::chown( $file, $owner, $recursive );
+			}
+		};
+
+		$spy->chown( $directory, (int) fileowner( $directory ), true );
+
+		$this->assertContains(
+			$nested_file,
+			$spy->visited,
+			'chown() did not recurse into the nested subdirectory.'
+		);
+	}
 }