Skip to content

Commit 8fa6f73

Browse files
committed
Replace Zend_Json from the Theme file tree model
1 parent e3fc5b7 commit 8fa6f73

File tree

1 file changed

+12
-2
lines changed
  • app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files

1 file changed

+12
-2
lines changed

app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,30 @@ class Tree extends \Magento\Backend\Block\Template
2222
*/
2323
protected $urlEncoder;
2424

25+
/**
26+
* @var \Magento\Framework\Serialize\Serializer\Json
27+
*/
28+
private $serializer;
29+
2530
/**
2631
* @param \Magento\Backend\Block\Template\Context $context
2732
* @param \Magento\Theme\Helper\Storage $storageHelper
2833
* @param \Magento\Framework\Url\EncoderInterface $urlEncoder
2934
* @param array $data
35+
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
36+
* @throws \RuntimeException
3037
*/
3138
public function __construct(
3239
\Magento\Backend\Block\Template\Context $context,
3340
\Magento\Theme\Helper\Storage $storageHelper,
3441
\Magento\Framework\Url\EncoderInterface $urlEncoder,
35-
array $data = []
42+
array $data = [],
43+
\Magento\Framework\Serialize\Serializer\Json $serializer = null
3644
) {
3745
$this->_storageHelper = $storageHelper;
3846
$this->urlEncoder = $urlEncoder;
47+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
48+
->get(\Magento\Framework\Serialize\Serializer\Json::class);
3949
parent::__construct($context, $data);
4050
}
4151

@@ -57,7 +67,7 @@ public function getTreeLoaderUrl()
5767
*/
5868
public function getTreeJson($data)
5969
{
60-
return \Zend_Json::encode($data);
70+
return $this->serializer->serialize($data);
6171
}
6272

6373
/**

0 commit comments

Comments
 (0)