vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the performance of wp_upload_dir():

Browse Source 
- 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.

git-svn-id: https://develop.svn.wordpress.org/trunk@36565 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2016-02-17 22:51:01 +00:00
parent 1afe1da216
commit c7936b8785
5 changed files with 159 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
tests/phpunit/tests/upload.php
View File

@@ -26,22 +26,24 @@ class Tests_Upload extends WP_UnitTestCase {
function test_upload_dir_default() {
// wp_upload_dir() with default parameters
$info = wp_upload_dir();
$this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
$this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
$this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
$this->assertEquals( '', $info['error'] );
$subdir = gmstrftime('/%Y/%m');
$this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads' . $subdir, $info['url'] );
$this->assertEquals( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
$this->assertEquals( $subdir, $info['subdir'] );
$this->assertEquals( false, $info['error'] );
}
function test_upload_dir_relative() {
// wp_upload_dir() with a relative upload path that is not 'wp-content/uploads'
update_option( 'upload_path', 'foo/bar' );
$info = wp_upload_dir();
$this->delete_folders( ABSPATH . 'foo' );
$info = _wp_upload_dir();
$subdir = gmstrftime('/%Y/%m');
$this->assertEquals( get_option( 'siteurl' ) . '/foo/bar/' . gmstrftime('%Y/%m'), $info['url'] );
$this->assertEquals( ABSPATH . 'foo/bar/' . gmstrftime('%Y/%m'), $info['path'] );
$this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
$this->assertEquals( '', $info['error'] );
$this->assertEquals( get_option( 'siteurl' ) . '/foo/bar' . $subdir, $info['url'] );
$this->assertEquals( ABSPATH . 'foo/bar' . $subdir, $info['path'] );
$this->assertEquals( $subdir, $info['subdir'] );
$this->assertEquals( false, $info['error'] );
}
/**
@@ -49,45 +51,63 @@ class Tests_Upload extends WP_UnitTestCase {
*/
function test_upload_dir_absolute() {
$path = '/tmp/wp-unit-test';
// wp_upload_dir() with an absolute upload path
update_option( 'upload_path', $path );
// doesn't make sense to use an absolute file path without setting the url path
update_option( 'upload_url_path', '/baz' );
$info = wp_upload_dir();
$this->delete_folders( $path );
$this->assertEquals( '/baz/' . gmstrftime('%Y/%m'), $info['url'] );
$this->assertEquals( "$path/" . gmstrftime('%Y/%m'), $info['path'] );
$this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
$this->assertEquals( '', $info['error'] );
// Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.
// It doesn't create the /year/month directories.
$info = _wp_upload_dir();
$subdir = gmstrftime('/%Y/%m');
$this->assertEquals( '/baz' . $subdir, $info['url'] );
$this->assertEquals( $path . $subdir, $info['path'] );
$this->assertEquals( $subdir, $info['subdir'] );
$this->assertEquals( false, $info['error'] );
}
function test_upload_dir_no_yearnum() {
update_option( 'uploads_use_yearmonth_folders', 0 );
$info = wp_upload_dir();
// Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.
$info = _wp_upload_dir();
$this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads', $info['url'] );
$this->assertEquals( ABSPATH . 'wp-content/uploads', $info['path'] );
$this->assertEquals( '', $info['subdir'] );
$this->assertEquals( '', $info['error'] );
$this->assertEquals( false, $info['error'] );
}
function test_upload_path_absolute() {
update_option( 'upload_url_path', 'http://example.org/asdf' );
$info = wp_upload_dir();
$this->assertEquals( 'http://example.org/asdf/' . gmstrftime('%Y/%m'), $info['url'] );
$this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
$this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
$this->assertEquals( '', $info['error'] );
// Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.
// It doesn't create the /year/month directories.
$info = _wp_upload_dir();
$subdir = gmstrftime('/%Y/%m');
$this->assertEquals( 'http://example.org/asdf' . $subdir, $info['url'] );
$this->assertEquals( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
$this->assertEquals( $subdir, $info['subdir'] );
$this->assertEquals( false, $info['error'] );
}
function test_upload_dir_empty() {
// upload path setting is empty - it should default to 'wp-content/uploads'
update_option('upload_path', '');
$info = wp_upload_dir();
$this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
$this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
$this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
$this->assertEquals( '', $info['error'] );
// Use `_wp_upload_dir()` directly to bypass caching and work with the changed options.
// It doesn't create the /year/month directories.
$info = _wp_upload_dir();
$subdir = gmstrftime('/%Y/%m');
$this->assertEquals( get_option( 'siteurl' ) . '/wp-content/uploads' . $subdir, $info['url'] );
$this->assertEquals( ABSPATH . 'wp-content/uploads' . $subdir, $info['path'] );
$this->assertEquals( $subdir, $info['subdir'] );
$this->assertEquals( false, $info['error'] );
}
}