Skip to content

DB/DirectDatabaseQuery: allow for more caching functions #2654

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

Merged
jrfnl merged 1 commit into from
Nov 24, 2025
Merged

DB/DirectDatabaseQuery: allow for more caching functions #2654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 25 additions & 15 deletions WordPress/Sniffs/DB/DirectDatabaseQuerySniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ final class DirectDatabaseQuerySniff extends Sniff {
* @var array
*/
protected $cacheGetFunctions = array(
'wp_cache_get' => true,
'wp_cache_get' => true,
'wp_cache_get_multiple' => true,
'wp_cache_get_multiple_salted' => true,
'wp_cache_get_salted' => true,
);

/**
Expand All @@ -95,8 +98,12 @@ final class DirectDatabaseQuerySniff extends Sniff {
* @var array
*/
protected $cacheSetFunctions = array(
'wp_cache_set' => true,
'wp_cache_add' => true,
'wp_cache_add' => true,
'wp_cache_add_multiple' => true,
'wp_cache_set' => true,
'wp_cache_set_multiple' => true,
'wp_cache_set_multiple_salted' => true,
'wp_cache_set_salted' => true,
);

/**
Expand All @@ -109,18 +116,21 @@ final class DirectDatabaseQuerySniff extends Sniff {
* @var array
*/
protected $cacheDeleteFunctions = array(
'wp_cache_delete' => true,
'clean_attachment_cache' => true,
'clean_blog_cache' => true,
'clean_bookmark_cache' => true,
'clean_category_cache' => true,
'clean_comment_cache' => true,
'clean_network_cache' => true,
'clean_object_term_cache' => true,
'clean_page_cache' => true,
'clean_post_cache' => true,
'clean_term_cache' => true,
'clean_user_cache' => true,
'wp_cache_delete' => true,
'wp_cache_delete_multiple' => true,
'wp_cache_flush_group' => true,
'wp_cache_flush_runtime' => true,
'clean_attachment_cache' => true,
'clean_blog_cache' => true,
'clean_bookmark_cache' => true,
'clean_category_cache' => true,
'clean_comment_cache' => true,
'clean_network_cache' => true,
'clean_object_term_cache' => true,
'clean_page_cache' => true,
'clean_post_cache' => true,
'clean_term_cache' => true,
'clean_user_cache' => true,
);

/**
Expand Down
31 changes: 31 additions & 0 deletions WordPress/Tests/DB/DirectDatabaseQueryUnitTest.1.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,3 +475,34 @@ function callToMultiLevelNamespaceRelativeCacheDelete() {
$wpdb->query( 'SELECT X FROM Y' ); // Warning direct DB call.
namespace\Sub\clean_blog_cache( 1 );
}

// Handle more caching functions.
function cache_multiple() {
global $wpdb;
$data = wp_cache_get_multiple( ['keyA', 'keyB'] );
if ( false !== $data ) {
$data = $wpdb->get_results( $query ); // Warning direct DB call.
\wp_cache_add_multiple( $data );
}
}

function cache_multiple_salted() {
global $wpdb;
$data = \wp_cache_get_multiple_salted( ...$params );
if ( false !== $data ) {
$data = $wpdb->get_col( $query ); // Warning direct DB call.
wp_cache_set_multiple_salted( ...$params );
}
}

function cache_delete_multiple() {
global $wpdb;
$wpdb->replace( $query ); // Warning direct DB call.
WP_cache_delete_multiple( ['keyA', 'keyB'] );
}

function cache_flush_group() {
global $wpdb;
$wpdb->delete( $query ); // Warning direct DB call.
wp_cache_flush_group( 'group' );
}
4 changes: 4 additions & 0 deletions WordPress/Tests/DB/DirectDatabaseQueryUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ public function getWarningList( $testFile = '' ) {
461 => 1,
468 => 1,
475 => 1,
484 => 1,
493 => 1,
500 => 1,
506 => 1,
);
default:
return array();
Expand Down
Loading