Skip to content

Commit b54b6e8

Browse files
committed
MAGETWO-66050: Remove usages of unserialize in Magento/Framework/View
1 parent aa27856 commit b54b6e8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lib/internal/Magento/Framework/View/Element/Messages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ public function setSecondLevelTagName($tagName)
334334
*/
335335
public function getCacheKeyInfo()
336336
{
337-
return ['storage_types' => serialize($this->usedStorageTypes)];
337+
return ['storage_types' => implode('|', $this->usedStorageTypes)];
338338
}
339339

340340
/**

lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct(\Magento\Framework\View\FileSystem $viewFileSystem)
4444
*/
4545
public function getTemplateFileName($template, $params = [])
4646
{
47-
$key = $template . '_' . serialize($params);
47+
$key = $template . '_' . json_encode($params);
4848
if (!isset($this->_templateFilesMap[$key])) {
4949
$this->_templateFilesMap[$key] = $this->_viewFileSystem->getTemplateFileName($template, $params);
5050
}

lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,10 @@ public function testGetMessageTypes()
240240

241241
public function testGetCacheKeyInfo()
242242
{
243-
$emptyMessagesCacheKey = ['storage_types' => 'a:0:{}'];
243+
$emptyMessagesCacheKey = ['storage_types' => ''];
244244
$this->assertEquals($emptyMessagesCacheKey, $this->messages->getCacheKeyInfo());
245245

246-
$messagesCacheKey = ['storage_types' => 'a:1:{i:0;s:7:"default";}'];
246+
$messagesCacheKey = ['storage_types' => 'default'];
247247
$this->messages->addStorageType(Manager::DEFAULT_GROUP);
248248
$this->assertEquals($messagesCacheKey, $this->messages->getCacheKeyInfo());
249249
}

0 commit comments

Comments
 (0)