Changeset 55581 for trunk/tests/phpunit/includes/object-cache.php

Timestamp:

03/22/2023 09:25:32 AM (19 months ago)

Author:

SergeyBiryukov

Message:

Tests: Consistently sanitize expiration in the test suite's Memcached implementation.

In a previous commit, the ::sanitize_expiration() call in the ::add() method was moved closer to where the value is used.

This commit does the same for the other methods:

• ::cas()
• ::replace()
• ::set()
• ::setMulti()

Follow-up to [40561], [55577].

See #57841, #57963.

File:

• trunk/tests/phpunit/includes/object-cache.php (modified) (8 diffs)

trunk/tests/phpunit/includes/object-cache.php

@@ -1182 +1182 @@
     public function cas( $cas_token, $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
         $derived_key = $this->buildKey( $key, $group );
-        $expiration  = $this->sanitize_expiration( $expiration );
 
         /**
@@ -1193 +1192 @@
             return true;
         }
+
+        $expiration = $this->sanitize_expiration( $expiration );
 
         // Save to Memcached.
@@ -1907 +1908 @@
     public function replace( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
         $derived_key = $this->buildKey( $key, $group );
-        $expiration  = $this->sanitize_expiration( $expiration );
 
         // If group is a non-Memcached group, save to runtime cache, not Memcached.
@@ -1920 +1920 @@
             return true;
         }
+
+        $expiration = $this->sanitize_expiration( $expiration );
 
         // Save to Memcached.
@@ -1972 +1974 @@
     public function set( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
         $derived_key = $this->buildKey( $key, $group );
-        $expiration  = $this->sanitize_expiration( $expiration );
 
         // If group is a non-Memcached group, save to runtime cache, not Memcached.
@@ -1979 +1980 @@
             return true;
         }
+
+        $expiration = $this->sanitize_expiration( $expiration );
 
         // Save to Memcached.
@@ -2034 +2037 @@
         // Build final keys and replace $items keys with the new keys.
         $derived_keys  = $this->buildKeys( array_keys( $items ), $groups );
-        $expiration    = $this->sanitize_expiration( $expiration );
         $derived_items = array_combine( $derived_keys, $items );
 
@@ -2049 +2051 @@
             }
         }
+
+        $expiration = $this->sanitize_expiration( $expiration );
 
         // Save to memcached.