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

Multisite: Revert [41719].

Browse Source 
While `get_site_by()` makes sense as a more explicit and less complex replacement for `get_blog_details()`, it is not ready yet in terms of caching, where it currently falls short of the older function under specific circumstances.

See #40180, #40228.


git-svn-id: https://develop.svn.wordpress.org/trunk@41883 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz
2017-10-16 22:28:52 +00:00
parent 652c632355
commit 363445adcb
4 changed files with 183 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/phpunit/tests/multisite/site.php
View File

@@ -118,21 +118,22 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
// $get_all = false, only retrieve details from the blogs table
$details = get_blog_details( $blog_id, false );
$cached_details = wp_cache_get( $blog_id, 'sites' );
$this->assertNotFalse( $cached_details );
$this->assertEqualSets( get_object_vars( $details ), get_object_vars( $cached_details ) );
// Combine domain and path for a site specific cache key.
$key = md5( $details->domain . $details->path );
$this->assertEquals( $details, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
// get_blogaddress_by_name()
$this->assertEquals( 'http://' . $details->domain . $details->path, get_blogaddress_by_name( trim( $details->path, '/' ) ) );
// This is empty until get_blog_details() is called with $get_all = true
$this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
// These are empty until get_blog_details() is called with $get_all = true
$this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
$this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
// $get_all = true, populate the full blog-details cache and the blog slug lookup cache
$details = get_blog_details( $blog_id, true );
$cached_details = wp_cache_get( $blog_id, 'site-details' );
$this->assertNotFalse( $cached_details );
$this->assertEqualSets( get_object_vars( $details ), get_object_vars( $cached_details ) );
$this->assertEquals( $details, wp_cache_get( $blog_id, 'blog-details' ) );
$this->assertEquals( $details, wp_cache_get( $key, 'blog-lookup' ) );
// Check existence of each database table for the created site.
foreach ( $wpdb->tables( 'blog', false ) as $table ) {
@@ -195,8 +196,9 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
// Delete the site without forcing a table drop.
wpmu_delete_blog( $blog_id, false );
$this->assertEquals( false, wp_cache_get( $blog_id, 'sites' ) );
$this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
$this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
$this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
$this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
$this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
}
@@ -232,8 +234,9 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
// Delete the site and force a table drop.
wpmu_delete_blog( $blog_id, true );
$this->assertEquals( false, wp_cache_get( $blog_id, 'sites' ) );
$this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
$this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
$this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
$this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
$this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
}
@@ -269,8 +272,9 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
// Delete the site and force a table drop.
wpmu_delete_blog( $blog_id, true );
$this->assertEquals( false, wp_cache_get( $blog_id, 'sites' ) );
$this->assertEquals( false, wp_cache_get( $blog_id, 'site-details' ) );
$this->assertEquals( false, wp_cache_get( $blog_id, 'blog-details' ) );
$this->assertEquals( false, wp_cache_get( $blog_id . 'short', 'blog-details' ) );
$this->assertEquals( false, wp_cache_get( $key, 'blog-lookup' ) );
$this->assertEquals( false, wp_cache_get( $key, 'blog-id-cache' ) );
}
@@ -386,21 +390,19 @@ class Tests_Multisite_Site extends WP_UnitTestCase {
// Prime the cache for an invalid site.
get_blog_details( $blog_id );
// When the cache is primed with an invalid site, the value is not set.
$this->assertFalse( wp_cache_get( $blog_id, 'site-details' ) );
// When the cache is primed with an invalid site, the value is set to -1.
$this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) );
// Create a site in the invalid site's place.
self::factory()->blog->create();
// When a new site is created, its cache is cleared through refresh_blog_details.
$this->assertFalse( wp_cache_get( $blog_id, 'site-details' ) );
$this->assertFalse( wp_cache_get( $blog_id, 'blog-details' ) );
$blog = get_blog_details( $blog_id );
// When the cache is refreshed, it should now equal the site data.
$cached_blog = wp_cache_get( $blog_id, 'site-details' );
$this->assertNotFalse( $cached_blog );
$this->assertEqualSets( get_object_vars( $blog ), get_object_vars( $cached_blog ) );
$this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) );
}
/**

38
tests/phpunit/tests/multisite/siteDetails.php
View File

@@ -27,6 +27,25 @@ class Tests_Multisite_Site_Details extends WP_UnitTestCase {
$this->assertFalse( $cached_result );
}
/**
* @dataProvider data_whitelisted_options
*
* @ticket 40063
*/
public function test_update_whitelisted_option_deletes_blog_details_cache( $whitelisted_option, $temporary_value ) {
$blog_details = get_blog_details();
$original_value = $blog_details->$whitelisted_option;
update_option( $whitelisted_option, $temporary_value );
$cached_result = wp_cache_get( $blog_details->id, 'blog-details' );
/* Reset to original value. */
update_option( $whitelisted_option, $original_value );
$this->assertFalse( $cached_result );
}
/**
* @dataProvider data_whitelisted_options
*
@@ -46,6 +65,25 @@ class Tests_Multisite_Site_Details extends WP_UnitTestCase {
$this->assertNotFalse( $cached_result );
}
/**
* @dataProvider data_whitelisted_options
*
* @ticket 40063
*/
public function test_update_whitelisted_option_does_not_delete_short_blog_details_cache( $whitelisted_option, $temporary_value ) {
$blog_details = get_blog_details( null, false );
$original_value = get_option( $whitelisted_option );
update_option( $whitelisted_option, $temporary_value );
$cached_result = wp_cache_get( $blog_details->id . 'short', 'blog-details' );
/* Reset to original value. */
update_option( $whitelisted_option, $original_value );
$this->assertNotFalse( $cached_result );
}
/**
* @dataProvider data_whitelisted_options
*