diff --git a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php index 8c99eb1..5c8366b 100644 --- a/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php +++ b/core/lib/Drupal/Core/KeyValueStore/DatabaseStorageExpirable.php @@ -92,13 +92,13 @@ function setWithExpire($key, $value, $time_to_live) { /** * Implements Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface::setWithExpireIfNotExists(). */ - function setWithExpireIfNotExists($key, $value, $expire) { + function setWithExpireIfNotExists($key, $value, $time_to_live) { $result = $this->connection->merge($this->table) ->insertFields(array( 'collection' => $this->collection, 'name' => $key, 'value' => $this->serializer->encode($value), - 'expire' => REQUEST_TIME + $expire, + 'expire' => REQUEST_TIME + $time_to_live, )) ->condition('collection', $this->collection) ->condition('name', $key) @@ -109,9 +109,9 @@ function setWithExpireIfNotExists($key, $value, $expire) { /** * {@inheritdoc} */ - function setMultipleWithExpire(array $data, $expire) { + function setMultipleWithExpire(array $data, $time_to_live) { foreach ($data as $key => $value) { - $this->setWithExpire($key, $value, $expire); + $this->setWithExpire($key, $value, $time_to_live); } } diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php index 08a02b8..1fef683 100644 --- a/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php +++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueStoreExpirableInterface.php @@ -31,22 +31,22 @@ public function setWithExpire($key, $value, $time_to_live); * The key of the data to store. * @param mixed $value * The data to store. - * @param int $expire + * @param int $time_to_live * The time to live for items, in seconds. * * @return bool * TRUE if the data was set, or FALSE if it already existed. */ - public function setWithExpireIfNotExists($key, $value, $expire); + public function setWithExpireIfNotExists($key, $value, $time_to_live); /** * Saves an array of values with a time to live. * * @param array $data * An array of data to store. - * @param int $expire + * @param int $time_to_live * The time to live for items, in seconds. */ - public function setMultipleWithExpire(array $data, $expire); + public function setMultipleWithExpire(array $data, $time_to_live); } diff --git a/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php b/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php index ca9d355..109f8fc 100644 --- a/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php +++ b/core/lib/Drupal/Core/KeyValueStore/NullStorageExpirable.php @@ -107,7 +107,7 @@ public function getCollectionName() { /** * Implements Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface::setMultipleWithExpire(). */ - public function setMultipleWithExpire(array $data, $expire) { } + public function setMultipleWithExpire(array $data, $time_to_live) { } /** * Implements Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface::setWithExpire(). @@ -117,6 +117,6 @@ public function setWithExpire($key, $value, $time_to_live) { } /** * Implements Drupal\Core\KeyValueStore\KeyValueStoreExpirableInterface::setWithExpireIfNotExists(). */ - public function setWithExpireIfNotExists($key, $value, $expire) { } + public function setWithExpireIfNotExists($key, $value, $time_to_live) { } }