[Cache] Allow ISO 8601 time intervals to specify default lifetime

Author: lstrojny

DependencyInjection/Configuration.php

@@ -1040,7 +1040,10 @@ private function addCacheSection(ArrayNodeDefinition $rootNode)
                                     ->end()
                                     ->scalarNode('tags')->defaultNull()->end()
                                     ->booleanNode('public')->defaultFalse()->end()
-                                    ->integerNode('default_lifetime')->end()
+                                    ->scalarNode('default_lifetime')
+                                        ->info('Default lifetime of the pool')
+                                        ->example('"600" for 5 minutes expressed in seconds, "PT5M" for five minutes expressed as ISO 8601 time interval, or "5 minutes" as a date expression')
+                                    ->end()
                                     ->scalarNode('provider')
                                         ->info('Overwrite the setting from the default provider for this adapter.')
                                     ->end()

Resources/config/schema/symfony-1.0.xsd

@@ -283,7 +283,7 @@
         <xsd:attribute name="adapter" type="xsd:string" />
         <xsd:attribute name="tags" type="xsd:string" />
         <xsd:attribute name="public" type="xsd:boolean" />
-        <xsd:attribute name="default-lifetime" type="xsd:integer" />
+        <xsd:attribute name="default-lifetime" type="xsd:string" />
         <xsd:attribute name="provider" type="xsd:string" />
         <xsd:attribute name="early-expiration-message-bus" type="xsd:string" />
         <xsd:attribute name="clearer" type="xsd:string" />

Tests/DependencyInjection/Fixtures/php/cache.php

@@ -22,7 +22,10 @@
                 'provider' => 'app.cache_pool',
             ],
             'cache.def' => [
-                'default_lifetime' => 11,
+                'default_lifetime' => 'PT11S',
+            ],
+            'cache.expr' => [
+                'default_lifetime' => '13 seconds',
             ],
             'cache.chain' => [
                 'default_lifetime' => 12,

Tests/DependencyInjection/Fixtures/xml/cache.xml

@@ -11,7 +11,8 @@
             <framework:pool name="cache.bar" adapter="cache.adapter.doctrine" default-lifetime="5" provider="app.doctrine_cache_provider" />
             <framework:pool name="cache.baz" adapter="cache.adapter.filesystem" default-lifetime="7" />
             <framework:pool name="cache.foobar" adapter="cache.adapter.psr6" default-lifetime="10" provider="app.cache_pool" />
-            <framework:pool name="cache.def" default-lifetime="11" />
+            <framework:pool name="cache.def" default-lifetime="PT11S" />
+            <framework:pool name="cache.expr" default-lifetime="13 seconds" />
             <framework:pool name="cache.chain" default-lifetime="12">
                 <framework:adapter name="cache.adapter.array" />
                 <framework:adapter name="cache.adapter.filesystem" />

Tests/DependencyInjection/Fixtures/yml/cache.yml

@@ -16,7 +16,9 @@ framework:
                 default_lifetime: 10
                 provider: app.cache_pool
             cache.def:
-                default_lifetime: 11
+                default_lifetime: PT11S
+            cache.expr:
+                default_lifetime: 13 seconds
             cache.chain:
                 default_lifetime: 12
                 adapter:

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -61,10 +61,10 @@
 use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
 use Symfony\Component\Validator\Mapping\Loader\PropertyInfoLoader;
 use Symfony\Component\Workflow;
+use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
 use Symfony\Component\Workflow\WorkflowEvents;
 use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\TagAwareCacheInterface;
-use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
 
 abstract class FrameworkExtensionTest extends TestCase
 {
@@ -1333,7 +1333,8 @@ public function testCachePoolServices()
         $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.bar', 'cache.adapter.doctrine', 5);
         $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.baz', 'cache.adapter.filesystem', 7);
         $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.foobar', 'cache.adapter.psr6', 10);
-        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.def', 'cache.app', 11);
+        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.def', 'cache.app', 'PT11S');
+        $this->assertCachePoolServiceDefinitionIsCreated($container, 'cache.expr', 'cache.app', '13 seconds');
 
         $chain = $container->getDefinition('cache.chain');
 

Tests/Functional/app/CachePools/config.yml

@@ -1,15 +1,21 @@
 imports:
     - { resource: default.yml }
 
+parameters:
+    env(LIFETIME_INTERVAL): 'PT10S'
+    env(LIFETIME_EXPRESSION): '13 seconds'
+
 framework:
     cache:
         pools:
             cache.pool1:
                 public: true
                 adapter: cache.system
+                default_lifetime: '%env(LIFETIME_EXPRESSION)%'
             cache.pool2:
                 public: true
                 adapter: cache.pool3
+                default_lifetime: '%env(LIFETIME_INTERVAL)%'
             cache.pool3:
                 clearer: ~
             cache.pool4: