Skip to content

Use wp_cache_flush_runtime in unit tests. #4417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Use wp_cache_flush_runtime in unit tests. #4417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b9b257
Use `wp_cache_flush_runtime`.
spacedmonkey May 3, 2023
312560b
Merge branch 'trunk' into 31463
spacedmonkey May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions tests/phpunit/includes/abstract-testcase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,9 @@ protected function _restore_hooks() {
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();
Comment on lines -390 to -392
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These three properties are not used for anything. I have removed them for now.

$wp_object_cache->cache = array();
wp_cache_flush_runtime();

if ( method_exists( $wp_object_cache, '__remoteset' ) ) {
if ( is_object( $wp_object_cache ) && method_exists( $wp_object_cache, '__remoteset' ) ) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not all object caches use this global. Check it is object before running this.

$wp_object_cache->__remoteset();
}

Expand Down
22 changes: 22 additions & 0 deletions tests/phpunit/includes/object-cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,12 +325,23 @@ function wp_cache_flush( $delay = 0 ) {
function wp_cache_supports( $feature ) {
switch ( $feature ) {
case 'get_multiple':
case 'flush_runtime':
return true;
default:
return false;
}
}

/**
* Removes all cache items from the in-memory runtime cache.
*
* @return bool True on success, false on failure.
*/
function wp_cache_flush_runtime() {
global $wp_object_cache;
return $wp_object_cache->flush_runtime();
}

/**
* Retrieves object from cache.
*
Expand Down Expand Up @@ -1412,6 +1423,17 @@ public function flush( $delay = 0 ) {
return $result;
}

/**
* Clears the in-memory cache of all data leaving the external cache untouched.
*
* @return bool Always returns true.
*/
public function flush_runtime() {
$this->cache = array();

return true;
}

/**
* Retrieves object from cache.
*
Expand Down