Coding Standards: Wrap long lines with global cache groups for better readability.

Follow-up to [946/tests], [1060/tests], [https://mu.trac.wordpress.org/changeset/1784 mu1784], [https://mu.trac.wordpress.org/changeset/2032 mu2032] [https://mu.trac.wordpress.org/changeset/2029 mu2029], [7986], [12128], [12603], [12688], [12732], [12755], [13125], [14009], [15482], [21403], [22092], [31347], [31348], [36258], [36393], [36413], [37918], [40343], [40347], [42836].

See #55647.

git-svn-id: https://develop.svn.wordpress.org/trunk@53823 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2022-08-04 13:31:19 +00:00
parent dc0672616c
commit 183bfc8b25
5 changed files with 124 additions and 6 deletions

View File

@ -731,7 +731,28 @@ function wp_start_object_cache() {
}
if ( function_exists( 'wp_cache_add_global_groups' ) ) {
wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'blog_meta' ) );
wp_cache_add_global_groups(
array(
'users',
'userlogins',
'usermeta',
'user_meta',
'useremail',
'userslugs',
'site-transient',
'site-options',
'blog-lookup',
'blog-details',
'rss',
'global-posts',
'blog-id-cache',
'networks',
'sites',
'site-details',
'blog_meta',
)
);
wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
}

View File

@ -552,7 +552,27 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
if ( is_array( $global_groups ) ) {
wp_cache_add_global_groups( $global_groups );
} else {
wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details', 'blog_meta' ) );
wp_cache_add_global_groups(
array(
'users',
'userlogins',
'usermeta',
'user_meta',
'useremail',
'userslugs',
'site-transient',
'site-options',
'blog-lookup',
'blog-details',
'rss',
'global-posts',
'blog-id-cache',
'networks',
'sites',
'site-details',
'blog_meta',
)
);
}
wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
@ -623,7 +643,27 @@ function restore_current_blog() {
if ( is_array( $global_groups ) ) {
wp_cache_add_global_groups( $global_groups );
} else {
wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details', 'blog_meta' ) );
wp_cache_add_global_groups(
array(
'users',
'userlogins',
'usermeta',
'user_meta',
'useremail',
'userslugs',
'site-transient',
'site-options',
'blog-lookup',
'blog-details',
'rss',
'global-posts',
'blog-id-cache',
'networks',
'sites',
'site-details',
'blog_meta',
)
);
}
wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );

View File

@ -366,15 +366,40 @@ abstract class WP_UnitTestCase_Base extends PHPUnit_Adapter_TestCase {
*/
public static function flush_cache() {
global $wp_object_cache;
$wp_object_cache->group_ops = array();
$wp_object_cache->stats = array();
$wp_object_cache->memcache_debug = array();
$wp_object_cache->cache = array();
if ( method_exists( $wp_object_cache, '__remoteset' ) ) {
$wp_object_cache->__remoteset();
}
wp_cache_flush();
wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details', 'blog_meta' ) );
wp_cache_add_global_groups(
array(
'users',
'userlogins',
'usermeta',
'user_meta',
'useremail',
'userslugs',
'site-transient',
'site-options',
'blog-lookup',
'blog-details',
'rss',
'global-posts',
'blog-id-cache',
'networks',
'sites',
'site-details',
'blog_meta',
)
);
wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
}

View File

@ -807,7 +807,16 @@ class WP_Object_Cache {
*
* @var array
*/
public $global_groups = array( 'users', 'userlogins', 'usermeta', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss' );
public $global_groups = array(
'users',
'userlogins',
'usermeta',
'site-options',
'site-lookup',
'blog-lookup',
'blog-details',
'rss',
);
/**
* List of groups not saved to Memcached.

View File

@ -20,9 +20,32 @@ class Tests_Cache extends WP_UnitTestCase {
private function &init_cache() {
global $wp_object_cache;
$cache_class = get_class( $wp_object_cache );
$cache = new $cache_class();
$cache->add_global_groups( array( 'global-cache-test', 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites', 'site-details' ) );
$cache->add_global_groups(
array(
'global-cache-test',
'users',
'userlogins',
'usermeta',
'user_meta',
'useremail',
'userslugs',
'site-transient',
'site-options',
'blog-lookup',
'blog-details',
'rss',
'global-posts',
'blog-id-cache',
'networks',
'sites',
'site-details',
)
);
return $cache;
}