ENGCOM-2647: [Forwardport] Fix false cache_lifetime usage in xml layouts #17350

Stanislav Idolov · web-flow · commit bb9a652a87ea · 2018-08-10T11:26:43.000+03:00
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,

Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ protected function getCacheLifetime()`
`1074`	`1074`
`1075`	`1075`	`$cacheLifetime = $this->getData('cache_lifetime');`
`1076`	`1076`	`if (false === $cacheLifetime \|\| null === $cacheLifetime) {`
`1077`		`- return $cacheLifetime;`
	`1077`	`+ return null;`
`1078`	`1078`	`}`
`1079`	`1079`
`1080`	`1080`	`return (int)$cacheLifetime;`