File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed
lib/internal/Magento/Framework/View Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -334,7 +334,7 @@ public function setSecondLevelTagName($tagName)
334
334
*/
335
335
public function getCacheKeyInfo ()
336
336
{
337
- return ['storage_types ' => serialize ( $ this ->usedStorageTypes )];
337
+ return ['storage_types ' => implode ( ' | ' , $ this ->usedStorageTypes )];
338
338
}
339
339
340
340
/**
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ public function __construct(\Magento\Framework\View\FileSystem $viewFileSystem)
44
44
*/
45
45
public function getTemplateFileName ($ template , $ params = [])
46
46
{
47
- $ key = $ template . '_ ' . serialize ($ params );
47
+ $ key = $ template . '_ ' . json_encode ($ params );
48
48
if (!isset ($ this ->_templateFilesMap [$ key ])) {
49
49
$ this ->_templateFilesMap [$ key ] = $ this ->_viewFileSystem ->getTemplateFileName ($ template , $ params );
50
50
}
Original file line number Diff line number Diff line change @@ -240,10 +240,10 @@ public function testGetMessageTypes()
240
240
241
241
public function testGetCacheKeyInfo ()
242
242
{
243
- $ emptyMessagesCacheKey = ['storage_types ' => 'a:0:{} ' ];
243
+ $ emptyMessagesCacheKey = ['storage_types ' => '' ];
244
244
$ this ->assertEquals ($ emptyMessagesCacheKey , $ this ->messages ->getCacheKeyInfo ());
245
245
246
- $ messagesCacheKey = ['storage_types ' => 'a:1:{i:0;s:7:" default";} ' ];
246
+ $ messagesCacheKey = ['storage_types ' => 'default ' ];
247
247
$ this ->messages ->addStorageType (Manager::DEFAULT_GROUP );
248
248
$ this ->assertEquals ($ messagesCacheKey , $ this ->messages ->getCacheKeyInfo ());
249
249
}
You can’t perform that action at this time.
0 commit comments