Changeset 54300 for trunk/tests/phpunit/includes/abstract-testcase.php

Timestamp:

09/25/2022 02:37:10 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Remove empty directory in WP_UnitTestCase_Base::rmdir().

The WP_UnitTestCase_Base::rmdir() method selectively deletes files from a directory, skipping any paths from the $ignore_files property.

This commit updates the method to remove the empty directory if there are no files left, bringing some parity with PHP native rmdir() function.

Follow-up to [677/tests], [29120].

See #55652.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (2 diffs)

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -1350 +1350 @@
          * Does not delete files if their paths are set in the `$ignore_files` property.
          *
+         * @since 4.0.0
+         * @since 6.1.0 Removes the empty directory if there are no files left.
+         *
          * @param string $path Directory path.
          */
@@ -1358 +1361 @@
                                 $this->unlink( $file );
                         }
+                }
+
+                // If there were no ignored files, remove the empty directory.
+                if ( ! array_intersect( $files, self::$ignore_files ) ) {
+                        rmdir( $path );
                 }
         }