Issue #3486193 by jurgenhaas, kopeboy, danielspeicher: eca_cache Lifetime until expiry improvements

modules/cache/src/Plugin/Action/CacheActionBase.php

@@ -125,7 +125,7 @@ abstract class CacheActionBase extends ConfigurableActionBase {
    */
   protected function getCacheTags(): array {
     $tags = [];
-    if ($this->configuration['tags'] !== '') {
+    if (trim($this->tokenService->replaceClear($this->configuration['tags'])) !== '') {
       $tags = array_values(DataTransferObject::buildArrayFromUserInput($this->configuration['tags']));
     }
     return $tags;

modules/cache/src/Plugin/Action/CacheWrite.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\eca_cache\Plugin\Action;
 
+use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\eca\Service\YamlParser;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -50,7 +51,13 @@ abstract class CacheWrite extends CacheActionBase {
       $value = $this->tokenService->getOrReplace($value);
     }
 
-    $expire = (int) ($this->configuration['expire'] ?? -1);
+    $expire = trim($this->tokenService->getOrReplace($this->configuration['expire']));
+    if ($expire === '') {
+      $expire = CacheBackendInterface::CACHE_PERMANENT;
+    }
+    else {
+      $expire = (int) $expire;
+    }
     $tags = $this->getCacheTags();
 
     $cache->set($key, $value, $expire, $tags);
@@ -89,11 +96,12 @@ abstract class CacheWrite extends CacheActionBase {
     ];
     $form['expire'] = [
       '#type' => 'number',
-      '#title' => $this->t('Lifetime until expiry'),
+      '#title' => $this->t('Expiration time'),
       '#description' => $this->t('The timestamp in seconds when the cached item expires. Set to -1 for unlimited lifetime.'),
       '#default_value' => $this->configuration['expire'],
       '#required' => TRUE,
       '#weight' => -20,
+      '#eca_token_replacement' => TRUE,
     ];
     $form['tags'] = [
       '#type' => 'textarea',
@@ -103,6 +111,7 @@ abstract class CacheWrite extends CacheActionBase {
       ]),
       '#default_value' => $this->configuration['tags'],
       '#weight' => -10,
+      '#eca_token_replacement' => TRUE,
     ];
     return parent::buildConfigurationForm($form, $form_state);
   }