Changeset 36565 for trunk/tests/phpunit/tests/media.php

Timestamp:

02/17/2016 10:51:01 PM (9 years ago)

Author:

azaozz

Message:

Improve the performance of wp_upload_dir():

• Cache the output in non-persistent cache.
• Cache the result from wp_mkdir_p() in persistent cache (when present).
• Introduce wp_get_upload_dir() for use when not uploading files. It is equivalent to wp_upload_dir() but does not check for the existence or create the upload directory.
• Change tests to use the non-cached _wp_upload_dir(). They change options on the fly (should never be used in production) to simulate different environments.
• Introduce _upload_dir_no_subdir() and _upload_dir_https() to facilitate testing. These use the proper upload_dir filter to simulate different environments.

Props kovshenin, azaozz.
See #34359.

File:

• trunk/tests/phpunit/tests/media.php (modified) (2 diffs)

trunk/tests/phpunit/tests/media.php

@@ -896 +896 @@
         global $_wp_additional_image_sizes;
 
-        // Save the current setting for uploads folders
-        $uploads_use_yearmonth_folders = get_option( 'uploads_use_yearmonth_folders' );
-
         // Disable date organized uploads
-        update_option( 'uploads_use_yearmonth_folders', 0 );
+        add_filter( 'upload_dir', '_upload_dir_no_subdir' );
 
         // Make an image.
@@ -938 +935 @@
         // Remove the attachment
         wp_delete_attachment( $id );
-
-        // Leave the uploads option the way you found it.
-        update_option( 'uploads_use_yearmonth_folders', $uploads_use_yearmonth_folders );
+        remove_filter( 'upload_dir', '_upload_dir_no_subdir' );
     }