ENGCOM-2647: [Forwardport] Fix false cache_lifetime usage in xml layo…

…uts #17350
magento · Aug 10, 2018 · bb9a652 · bb9a652
2 parents acd9947 + 1736b9d
commit bb9a652
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -1074,7 +1074,7 @@ protected function getCacheLifetime()
 
         $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
@@ -290,9 +290,9 @@ public function getCacheLifetimeDataProvider()
                 'dataFromCache' => 'dataFromCache',
                 'dataForSaveCache' => '',
                 'expectsDispatchEvent' => $this->exactly(2),
-                'expectsCacheLoad' => $this->once(),
+                'expectsCacheLoad' => $this->never(),
                 'expectsCacheSave' => $this->never(),
-                'expectedResult' => 'dataFromCache',
+                'expectedResult' => '',
             ],
             [
                 'cacheLifetime' => 120,