Merge branch 'WordPress:trunk' into trunk

Author: dd32

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

@@ -176,7 +176,7 @@ public function chmod( $file, $mode = false, $recursive = false ) {
 		}
 
 		if ( ! $recursive || ! $this->is_dir( $file ) ) {
-			$current_mode = fileperms( $file ) & 0777 | 0644;
+			$current_mode = fileperms( $file ) & 0777;
 
 			/*
 			 * fileperms() populates the stat cache, so have to clear it

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

@@ -101,4 +101,36 @@ public function test_should_change_mode_recursively(): void {
 			'The mode was not applied to a file in a nested subdirectory.'
 		);
 	}
+
+	/**
+	 * Tests that `WP_Filesystem_Direct::chmod()` uses the correct mask for comparing permissions.
+	 *
+	 * The `& 0777` mask should be used to strip the filetype bits from the `fileperms( $file )` value
+	 * so that the current permission bits can be used for comparison with the requested mode.
+	 *
+	 * @ticket 65695
+	 */
+	public function test_should_use_correct_permission_mask_for_files(): void {
+		if ( self::is_windows() ) {
+			$this->markTestSkipped( 'chmod() does not support octal modes on Windows.' );
+		}
+
+		$file = self::$file_structure['visible_file']['path'];
+
+		// Set the initial permissions.
+		self::$filesystem->chmod( $file, 0600 );
+
+		$this->assertTrue(
+			self::$filesystem->chmod( $file, 0644 ),
+			'chmod() did not report success.'
+		);
+
+		clearstatcache();
+
+		$this->assertSame(
+			'644',
+			self::$filesystem->getchmod( $file ),
+			'The requested mode was not applied to the file.'
+		);
+	}
 }