Changeset 61398

Timestamp:

12/22/2025 01:16:28 AM (9 months ago)

Author:

westonruter

Message:

Filesystem API: Resolve FIXME comment for WP_Filesystem_Direct::getchmod() by explicitly returning '0' in error case.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10637

Follow-up to [11831].

Props vietcgi, westonruter.
See #10304.
Fixes #64426.

Location:

trunk

Files:

• src/wp-admin/includes/class-wp-filesystem-direct.php (modified) (1 diff)
• tests/phpunit/tests/filesystem/wpFilesystemDirect/getchmod.php (modified) (1 diff)

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

@@ -250 +250 @@
          * Gets the permissions of the specified file or filepath in their octal format.
          *
-         * FIXME does not handle errors in fileperms()
-         *
          * @since 2.5.0
          *
          * @param string $file Path to the file.
-         * @return string Mode of the file (the last 3 digits).
+         * @return string Mode of the file (the last 3 digits), or the string "0" on failure.
          */
         public function getchmod( $file ) {
-                return substr( decoct( @fileperms( $file ) ), -3 );
+                $perms = @fileperms( $file );
+                if ( false === $perms ) {
+                        return '0';
+                }
+
+                return substr( decoct( $perms ), -3 );
         }
 

trunk/tests/phpunit/tests/filesystem/wpFilesystemDirect/getchmod.php

@@ -34 +34 @@
         /**
          * Tests that `WP_Filesystem_Direct::getchmod()` returns
-         * the permissions for a path that does not exist.
+         * "0" for a path that does not exist.
          *
          * @dataProvider data_paths_that_do_not_exist
          *
          * @ticket 57774
+         * @ticket 64426
          *
          * @param string $path The path.
          */
-        public function test_should_get_chmod_for_a_path_that_does_not_exist( $path ) {
+        public function test_should_return_zero_for_a_path_that_does_not_exist( $path ) {
                 $actual = self::$filesystem->getchmod( self::$file_structure['test_dir']['path'] . $path );
-                $this->assertNotSame( '', $actual );
+                $this->assertSame( '0', $actual );
         }
 }