Changeset 65190

Timestamp:

11/02/2026 03:54:19 PM (2 days ago)

Author:

lancewillett

Message:

Tests: Clean test uploads before loading WordPress.

Delete the test uploads directory before loading plugins and themes. Calling wp_upload_dir() during loading can create and cache the directory; deleting it afterward leaves that cached path missing.

Use PHP filesystem operations before WordPress functions are available, handle Windows directory symlinks, and report directory traversal exceptions.

Follow-up to [65177].

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

Props oaratovskyi, adrianmoldovanwp.
See #63532.

File:

• trunk/tests/phpunit/includes/bootstrap.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -331 +331 @@
 }
 
+/*
+ * Delete the wp-content/test-suite-uploads folder before WordPress loads.
+ *
+ * Plugins and themes may call wp_upload_dir() while loading, which creates the folder and
+ * caches it as created. Deleting it afterwards would leave a cached path that no longer exists.
+ * WordPress functions are not available yet, so this uses plain PHP.
+ */
+if ( ! empty( $delete_tests_uploads_dir ) ) {
+        $uploads_test_run_dir = ABSPATH . UPLOADS;
+
+        if ( is_dir( $uploads_test_run_dir ) ) {
+                try {
+                        $uploads_test_run_files = new RecursiveIteratorIterator(
+                                new RecursiveDirectoryIterator( $uploads_test_run_dir, FilesystemIterator::SKIP_DOTS ),
+                                RecursiveIteratorIterator::CHILD_FIRST
+                        );
+
+                        foreach ( $uploads_test_run_files as $uploads_test_run_file ) {
+                                // Windows removes symlinks to directories with rmdir(), not unlink().
+                                if ( $uploads_test_run_file->isDir() && ( ! $uploads_test_run_file->isLink() || 'Windows' === PHP_OS_FAMILY ) ) {
+                                        rmdir( $uploads_test_run_file->getPathname() );
+                                } else {
+                                        unlink( $uploads_test_run_file->getPathname() );
+                                }
+                        }
+
+                        rmdir( $uploads_test_run_dir );
+                } catch ( UnexpectedValueException $uploads_test_run_exception ) {
+                        echo 'Could not delete the test uploads directory: ' . $uploads_test_run_exception->getMessage() . PHP_EOL;
+                }
+        }
+
+        unset( $uploads_test_run_dir, $uploads_test_run_files, $uploads_test_run_file, $uploads_test_run_exception );
+}
+unset( $delete_tests_uploads_dir );
+
 // Load WordPress.
 require_once ABSPATH . 'wp-settings.php';
-
-// Process delete wp-content/test-suite-uploads folder.
-if ( ! empty( $delete_tests_uploads_dir ) ) {
-        $uploads_test_run_dir = ABSPATH . UPLOADS;
-
-        if ( is_dir( $uploads_test_run_dir ) ) {
-                require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php';
-                require_once ABSPATH . 'wp-admin/includes/class-wp-filesystem-direct.php';
-
-                // Use the direct transport, as WP_Filesystem() may pick FTP and fail without credentials.
-                $uploads_test_run_fs = new WP_Filesystem_Direct( null );
-                $uploads_test_run_fs->delete( $uploads_test_run_dir, true );
-        }
-
-        unset( $uploads_test_run_dir, $uploads_test_run_fs );
-}
-unset( $delete_tests_uploads_dir );
 
 // Override the PHPMailer.