Breaking change: Configuration key "cacheLifetime" has precedence

cundd · Jun 5, 2024 · de0c913 · de0c913
1 parent c426237
commit de0c913
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Classes/Cache/CacheFactory.php b/Classes/Cache/CacheFactory.php
@@ -67,13 +67,13 @@ private function getCacheLifetime(
             return $cacheLifetime;
         }
 
-        $cacheLifetime = $configurationProvider->getSetting('cacheLifeTime');
-        if ($cacheLifetime !== null) {
+        $cacheLifetime = $configurationProvider->getSetting('cacheLifetime');
+        if ($cacheLifetime !== null && is_numeric($cacheLifetime) && $cacheLifetime > -1) {
             return (int)$cacheLifetime;
         }
 
-        $cacheLifetime = $configurationProvider->getSetting('cacheLifetime');
-        if ($cacheLifetime !== null) {
+        $cacheLifetime = $configurationProvider->getSetting('cacheLifeTime');
+        if ($cacheLifetime !== null && is_numeric($cacheLifetime) && $cacheLifetime > -1) {
             return (int)$cacheLifetime;
         }
 

diff --git a/Classes/Configuration/AbstractConfigurationProvider.php b/Classes/Configuration/AbstractConfigurationProvider.php
@@ -248,13 +248,14 @@ private function preparePath(array $configuration, string $path): array
      */
     private function detectCacheLifetimeConfiguration(array $configuration): int
     {
-        if (isset($configuration['cacheLifeTime']) && is_numeric($configuration['cacheLifeTime'])) {
-            return (int)$configuration['cacheLifeTime'];
-        }
         if (isset($configuration['cacheLifetime']) && is_numeric($configuration['cacheLifetime'])) {
             return (int)$configuration['cacheLifetime'];
         }
 
+        if (isset($configuration['cacheLifeTime']) && is_numeric($configuration['cacheLifeTime'])) {
+            return (int)$configuration['cacheLifeTime'];
+        }
+
         return -1;
     }
 

diff --git a/Tests/Unit/Configuration/AbstractConfigurationProviderCase.php b/Tests/Unit/Configuration/AbstractConfigurationProviderCase.php
@@ -23,9 +23,9 @@ abstract class AbstractConfigurationProviderCase extends TestCase
      */
     protected $fixture;
 
-    public function setUp(): void
+    public function setup(): void
     {
-        parent::setUp();
+        parent::setup();
 
         $settings = [
             'paths' => [
@@ -64,11 +64,12 @@ public function setUp(): void
     /**
      * @return ConfigurationProviderInterface|TypoScriptConfigurationProvider|StandaloneConfigurationProvider
      */
-    abstract function getConfigurationProviderToTest();
+    abstract public function getConfigurationProviderToTest();
 
     public function tearDown(): void
     {
         unset($this->fixture);
+        parent::tearDown();
     }
 
     /**
@@ -95,6 +96,7 @@ public function getConfiguredResourceTypesTest()
                     'vendor-my_other_ext-my_model2' => [
                         'path'          => 'vendor-my_other_ext-my_model2',
                         'cacheLifetime' => 3,
+                        'cacheLifeTime' => 200, // the key "cacheLifetime" must have precedence
                     ],
                 ],
             ]