<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53767] trunk: Cache API: Make the placement of `wp_cache_flush_group()` more consistent.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53767">53767</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53767","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-07-23 14:56:51 +0000 (Sat, 23 Jul 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Cache API: Make the placement of `wp_cache_flush_group()` more consistent.
Includes:
* Placing `WP_Object_Cache::flush_group()` next to `::flush()`.
* Placing `wp_cache_supports_group_flush()` next to `wp_cache_flush_group()`.
* Placing the `wp_cache_flush_group()` unit test next to the `::flush()` method test.
* Removing test name from assertion messages, as it is already mentioned directly above in case of failure.
* Adjusting function descriptions per the documentation standards.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52706">[52706]</a>, <a href="https://core.trac.wordpress.org/changeset/53763">[53763]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55647">#55647</a>, <a href="https://core.trac.wordpress.org/ticket/4476">#4476</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescachecompatphp">trunk/src/wp-includes/cache-compat.php</a></li>
<li><a href="#trunksrcwpincludescachephp">trunk/src/wp-includes/cache.php</a></li>
<li><a href="#trunksrcwpincludesclasswpobjectcachephp">trunk/src/wp-includes/class-wp-object-cache.php</a></li>
<li><a href="#trunktestsphpunitincludesobjectcachephp">trunk/tests/phpunit/includes/object-cache.php</a></li>
<li><a href="#trunktestsphpunittestscachephp">trunk/tests/phpunit/tests/cache.php</a></li>
<li><a href="#trunktestsphpunittestspluggablephp">trunk/tests/phpunit/tests/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescachecompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/cache-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cache-compat.php 2022-07-23 08:58:42 UTC (rev 53766)
+++ trunk/src/wp-includes/cache-compat.php 2022-07-23 14:56:51 UTC (rev 53767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,9 +145,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wp_cache_flush_group' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Removes all cache items in a group, if the object cache implementation supports it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Before calling this method, always check for group flushing support using the
- * `wp_cache_supports_group_flush()` method.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Before calling this function, always check for group flushing support using the
+ * `wp_cache_supports_group_flush()` function.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Object_Cache::flush_group()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wp_cache_supports_group_flush' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whether the object cache implementation supports flushing individual cache groups.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determines whether the object cache implementation supports flushing individual cache groups.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludescachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cache.php 2022-07-23 08:58:42 UTC (rev 53766)
+++ trunk/src/wp-includes/cache.php 2022-07-23 14:56:51 UTC (rev 53767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,19 +23,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whether the object cache implementation supports flushing individual cache groups.
- *
- * @since 6.1.0
- *
- * @see WP_Object_Cache::flush_group()
- *
- * @return bool True if group flushing is supported, false otherwise.
- */
-function wp_cache_supports_group_flush() {
- return true;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Adds data to the cache, if the cache key doesn't already exist.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,9 +283,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Removes all cache items in a group, if the object cache implementation supports it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Before calling this method, always check for group flushing support using the
- * `wp_cache_supports_group_flush()` method.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Before calling this function, always check for group flushing support using the
+ * `wp_cache_supports_group_flush()` function.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 6.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Object_Cache::flush_group()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,6 +302,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determines whether the object cache implementation supports flushing individual cache groups.
+ *
+ * @since 6.1.0
+ *
+ * @see WP_Object_Cache::flush_group()
+ *
+ * @return bool True if group flushing is supported, false otherwise.
+ */
+function wp_cache_supports_group_flush() {
+ return true;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Closes the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This function has ceased to do anything since WordPress 2.5. The
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpobjectcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-object-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-object-cache.php 2022-07-23 08:58:42 UTC (rev 53766)
+++ trunk/src/wp-includes/class-wp-object-cache.php 2022-07-23 14:56:51 UTC (rev 53767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,20 +291,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Removes all cache items in a group.
- *
- * @since 6.1.0
- *
- * @param string $group Name of group to remove from cache.
- * @return true Always returns true.
- */
- public function flush_group( $group ) {
- unset( $this->cache[ $group ] );
-
- return true;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Retrieves the cache contents, if it exists.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The contents will be first attempted to be retrieved by searching by the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,6 +496,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Removes all cache items in a group.
+ *
+ * @since 6.1.0
+ *
+ * @param string $group Name of group to remove from cache.
+ * @return true Always returns true.
+ */
+ public function flush_group( $group ) {
+ unset( $this->cache[ $group ] );
+
+ return true;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Sets the list of global cache groups.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre></div>
<a id="trunktestsphpunitincludesobjectcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/object-cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/object-cache.php 2022-07-23 08:58:42 UTC (rev 53766)
+++ trunk/tests/phpunit/includes/object-cache.php 2022-07-23 14:56:51 UTC (rev 53767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,6 +285,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Whether the object cache implementation supports flushing individual cache groups.
+ *
+ * @since 6.1.0
+ *
+ * @return bool True if group flushing is supported, false otherwise.
+ */
+function wp_cache_supports_group_flush() {
+ return false;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Retrieves object from cache.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Gets an object from cache based on $key and $group. In order to fully support
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -746,17 +757,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Whether the object cache implementation supports flushing individual cache groups.
- *
- * @since 6.1.0
- *
- * @return bool True if group flushing is supported, false otherwise.
- */
-function wp_cache_supports_group_flush() {
- return false;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Adds a group or set of groups to the list of non-persistent groups.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $groups A group or an array of groups to add.
</span></span></pre></div>
<a id="trunktestsphpunittestscachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/cache.php 2022-07-23 08:58:42 UTC (rev 53766)
+++ trunk/tests/phpunit/tests/cache.php 2022-07-23 14:56:51 UTC (rev 53767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,6 +129,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $this->cache->get( $key ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 4476
+ * @ticket 9773
+ *
+ * @covers ::wp_cache_flush_group
+ */
+ public function test_wp_cache_flush_group() {
+ $key = 'my-key';
+ $val = 'my-val';
+
+ wp_cache_set( $key, $val, 'group-test' );
+ wp_cache_set( $key, $val, 'group-kept' );
+
+ $this->assertSame( $val, wp_cache_get( $key, 'group-test' ), 'group-test should contain my-val' );
+
+ if ( wp_using_ext_object_cache() ) {
+ $this->setExpectedIncorrectUsage( 'wp_cache_flush_group' );
+ }
+
+ $results = wp_cache_flush_group( 'group-test' );
+
+ if ( wp_using_ext_object_cache() ) {
+ $this->assertFalse( $results );
+ } else {
+ $this->assertTrue( $results );
+ $this->assertFalse( wp_cache_get( $key, 'group-test' ), 'group-test should return false' );
+ $this->assertSame( $val, wp_cache_get( $key, 'group-kept' ), 'group-kept should still contain my-val' );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make sure objects are cloned going to and from the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_object_refs() {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__ . '_1';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,36 +445,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $found );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @ticket 4476
- * @ticket 9773
- *
- * test wp_cache_flush_group
- *
- * @covers ::wp_cache_flush_group
- */
- public function test_wp_cache_flush_group() {
- $key = 'my-key';
- $val = 'my-val';
-
- wp_cache_set( $key, $val, 'group-test' );
- wp_cache_set( $key, $val, 'group-kept' );
-
- $this->assertSame( $val, wp_cache_get( $key, 'group-test' ), 'test_wp_cache_flush_group: group-test should contain my-val' );
-
- if ( wp_using_ext_object_cache() ) {
- $this->setExpectedIncorrectUsage( 'wp_cache_flush_group' );
- }
-
- $results = wp_cache_flush_group( 'group-test' );
-
- if ( wp_using_ext_object_cache() ) {
- $this->assertFalse( $results );
- } else {
- $this->assertTrue( $results );
- $this->assertFalse( wp_cache_get( $key, 'group-test' ), 'test_wp_cache_flush_group: group-test should return false' );
- $this->assertSame( $val, wp_cache_get( $key, 'group-kept' ), 'test_wp_cache_flush_group: group-kept should still contain my-val' );
- }
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestspluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pluggable.php 2022-07-23 08:58:42 UTC (rev 53766)
+++ trunk/tests/phpunit/tests/pluggable.php 2022-07-23 14:56:51 UTC (rev 53767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // wp-includes/cache.php:
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_init' => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wp_cache_supports_group_flush' => array(),
</del><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_add' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key',
</span><span class="cx" style="display: block; padding: 0 10px"> 'data',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,6 +328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_flush' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_flush_runtime' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_flush_group' => array( 'group' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wp_cache_supports_group_flush' => array(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_close' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_add_global_groups' => array( 'groups' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_cache_add_non_persistent_groups' => array( 'groups' ),
</span></span></pre>
</div>
</div>
</body>
</html>