Changeset 56998

Timestamp:

10/24/2023 11:32:42 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correct the WP_Test_Stream::mkdir() method.

The method attempted to check if there is already a file with the same name, however the conditional used an undefined variable.

This commit prevents directory creation if a file or directory with the same name already exists, bringing consistency with the PHP mkdir() implementation.

Includes adding missing documentation for the method.

Reference: ​PHP Manual: streamWrapper::mkdir().

Follow-up to [49230].

Props david.binda, sadizaman, rajinsharwar, SergeyBiryukov.
Fixes #59406.

File:

• trunk/tests/phpunit/includes/class-wp-test-stream.php (modified) (1 diff)

trunk/tests/phpunit/includes/class-wp-test-stream.php

@@ -199 +199 @@
          *
          * @see streamWrapper::mkdir
+         *
+         * @param string $path    Directory which should be created.
+         * @param int    $mode    The value passed to mkdir().
+         * @param int    $options A bitwise mask of values, such as STREAM_MKDIR_RECURSIVE.
+         * @return bool True on success, false on failure.
          */
         public function mkdir( $path, $mode, $options ) {
                 $this->open( $path );
+
                 $plainfile = rtrim( $this->file, '/' );
 
-                if ( isset( WP_Test_Stream::$data[ $this->bucket ][ $file ] ) ) {
-                        return false;
-                }
+                // Check if a file or directory with the same name already exists.
+                if ( isset( WP_Test_Stream::$data[ $this->bucket ][ $plainfile ] )
+                        || isset( WP_Test_Stream::$data[ $this->bucket ][ $plainfile . '/' ] )
+                ) {
+                        return false;
+                }
+
                 $dir_ref = & $this->get_directory_ref();
                 $dir_ref = 'DIRECTORY';
+
                 return true;
         }