ENGCOM-1979: Fix false cache_lifetime usage in xml layouts #16086

magento · Jul 2, 2018 · 214f37f · 214f37f
2 parents 82f4707 + 0b7fd07
commit 214f37f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -1064,17 +1064,13 @@ protected function getCacheTags()
     /**
      * Get block cache life time
      *
-     * @return int|bool|null
+     * @return int|null
      */
     protected function getCacheLifetime()
     {
-        if (!$this->hasData('cache_lifetime')) {
-            return null;
-        }
-
         $cacheLifetime = $this->getData('cache_lifetime');
         if (false === $cacheLifetime || null === $cacheLifetime) {
-            return $cacheLifetime;
+            return null;
         }
 
         return (int)$cacheLifetime;

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -287,15 +287,6 @@ public function getCacheLifetimeDataProvider()
                 'expectsCacheSave' => $this->never(),
                 'expectedResult' => '',
             ],
-            [
-                'cacheLifetime' => false,
-                'dataFromCache' => 'dataFromCache',
-                'dataForSaveCache' => '',
-                'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
-                'expectsCacheSave' => $this->never(),
-                'expectedResult' => 'dataFromCache',
-            ],
             [
                 'cacheLifetime' => 120,
                 'dataFromCache' => 'dataFromCache',