File tree Expand file tree Collapse file tree 2 files changed +2
-15
lines changed
lib/internal/Magento/Framework/View Expand file tree Collapse file tree 2 files changed +2
-15
lines changed Original file line number Diff line number Diff line change @@ -1064,17 +1064,13 @@ protected function getCacheTags()
1064
1064
/**
1065
1065
* Get block cache life time
1066
1066
*
1067
- * @return int|bool| null
1067
+ * @return int|null
1068
1068
*/
1069
1069
protected function getCacheLifetime ()
1070
1070
{
1071
- if (!$ this ->hasData ('cache_lifetime ' )) {
1072
- return null ;
1073
- }
1074
-
1075
1071
$ cacheLifetime = $ this ->getData ('cache_lifetime ' );
1076
1072
if (false === $ cacheLifetime || null === $ cacheLifetime ) {
1077
- return $ cacheLifetime ;
1073
+ return null ;
1078
1074
}
1079
1075
1080
1076
return (int )$ cacheLifetime ;
Original file line number Diff line number Diff line change @@ -287,15 +287,6 @@ public function getCacheLifetimeDataProvider()
287
287
'expectsCacheSave ' => $ this ->never (),
288
288
'expectedResult ' => '' ,
289
289
],
290
- [
291
- 'cacheLifetime ' => false ,
292
- 'dataFromCache ' => 'dataFromCache ' ,
293
- 'dataForSaveCache ' => '' ,
294
- 'expectsDispatchEvent ' => $ this ->exactly (2 ),
295
- 'expectsCacheLoad ' => $ this ->once (),
296
- 'expectsCacheSave ' => $ this ->never (),
297
- 'expectedResult ' => 'dataFromCache ' ,
298
- ],
299
290
[
300
291
'cacheLifetime ' => 120 ,
301
292
'dataFromCache ' => 'dataFromCache ' ,
You can’t perform that action at this time.
0 commit comments