Skip to content

Commit 4f966fb

Browse files
tjwiebelltjwiebell
committed
MAGETWO-66329: Remove usages of serialize/unserialize in WidgetSampleData
- Replace static usage of unserialize with JSON serializer - Fix minor code style issues - Modify sample data CSV files to use new format
1 parent da1f610 commit 4f966fb

File tree

3 files changed

+35
-22
lines changed

3 files changed

+35
-22
lines changed

‎app/code/Magento/WidgetSampleData/Model/CmsBlock.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\WidgetSampleData\Model;
87

8+
use Magento\Framework\Serialize\Serializer\Json;
99
use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
1010

1111
/**
@@ -48,21 +48,28 @@ class CmsBlock
4848
*/
4949
protected $csvReader;
5050

51+
/**
52+
* @var Json
53+
*/
54+
private $serializer;
55+
5156
/**
5257
* @param SampleDataContext $sampleDataContext
5358
* @param \Magento\Widget\Model\Widget\InstanceFactory $widgetFactory
5459
* @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $themeCollectionFactory
5560
* @param \Magento\Cms\Model\BlockFactory $cmsBlockFactory
5661
* @param \Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory $appCollectionFactory
5762
* @param \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory
63+
* @param Json $serializer
5864
*/
5965
public function __construct(
6066
SampleDataContext $sampleDataContext,
6167
\Magento\Widget\Model\Widget\InstanceFactory $widgetFactory,
6268
\Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $themeCollectionFactory,
6369
\Magento\Cms\Model\BlockFactory $cmsBlockFactory,
6470
\Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory $appCollectionFactory,
65-
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory
71+
\Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory,
72+
Json $serializer = null
6673
) {
6774
$this->fixtureManager = $sampleDataContext->getFixtureManager();
6875
$this->csvReader = $sampleDataContext->getCsvReader();
@@ -71,10 +78,13 @@ public function __construct(
7178
$this->cmsBlockFactory = $cmsBlockFactory;
7279
$this->appCollectionFactory = $appCollectionFactory;
7380
$this->categoryFactory = $categoryFactory;
81+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
7482
}
7583

7684
/**
77-
* {@inheritdoc}
85+
* Loop through list of fixture files and install widget data
86+
*
87+
* @param string[] $fixtures
7888
*/
7989
public function install(array $fixtures)
8090
{
@@ -138,7 +148,10 @@ public function install(array $fixtures)
138148
$pageGroup = [];
139149
$group = $row['page_group'];
140150
$pageGroup['page_group'] = $group;
141-
$pageGroup[$group] = array_merge($pageGroupConfig[$group], unserialize($row['group_data']));
151+
$pageGroup[$group] = array_merge(
152+
$pageGroupConfig[$group],
153+
$this->serializer->unserialize($row['group_data'])
154+
);
142155
if (!empty($pageGroup[$group]['entities'])) {
143156
$pageGroup[$group]['entities'] = $this->getCategoryByUrlKey(
144157
$pageGroup[$group]['entities']

‎app/code/Magento/WidgetSampleData/fixtures/cmsblock.csv

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
block_identifier,type_code,theme_path,title,page_group,group_data
2-
contact-us-info,cms_static_block,"frontend/Magento/luma","Contact us info",pages,"a:2:{s:5:""block"";s:11:""content.top"";s:13:""layout_handle"";s:19:""contact_index_index"";}"
3-
footer_links_block,cms_static_block,"frontend/Magento/luma","Footer Links",all_pages,"a:1:{s:5:""block"";s:26:""cms_footer_links_container"";}"
4-
sale-left-menu-block,cms_static_block,"frontend/Magento/luma","Sale Left Menu",anchor_categories,"a:4:{s:8:""entities"";s:4:""sale"";s:5:""block"";s:12:""sidebar.main"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
5-
gear-left-menu-block,cms_static_block,"frontend/Magento/luma","Gear Left Menu",anchor_categories,"a:4:{s:8:""entities"";s:4:""gear"";s:5:""block"";s:12:""sidebar.main"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
6-
men-left-menu-block,cms_static_block,"frontend/Magento/luma","Men's Left Menu",anchor_categories,"a:4:{s:8:""entities"";s:3:""men"";s:5:""block"";s:12:""sidebar.main"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
7-
women-left-menu-block,cms_static_block,"frontend/Magento/luma","Women's Left Menu",anchor_categories,"a:4:{s:8:""entities"";s:5:""women"";s:5:""block"";s:12:""sidebar.main"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
8-
new-left-menu-block,cms_static_block,"frontend/Magento/luma","What's New Left Menu",anchor_categories,"a:4:{s:8:""entities"";s:11:""what-is-new"";s:5:""block"";s:12:""sidebar.main"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
9-
women-block,cms_static_block,frontend/Magento/luma,"Women Category Content",anchor_categories,"a:4:{s:8:""entities"";s:5:""women"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
10-
training-block,cms_static_block,frontend/Magento/luma,"Training Category Content",anchor_categories,"a:4:{s:8:""entities"";s:8:""training"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
11-
men-block,cms_static_block,frontend/Magento/luma,"Men Category Content",anchor_categories,"a:4:{s:8:""entities"";s:3:""men"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
12-
gear-block,cms_static_block,frontend/Magento/luma,"Gear Category Content",anchor_categories,"a:4:{s:8:""entities"";s:4:""gear"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
13-
new-block,cms_static_block,frontend/Magento/luma,"New Products Category Content",anchor_categories,"a:4:{s:8:""entities"";s:11:""what-is-new"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
14-
sale-block,cms_static_block,"frontend/Magento/luma","Sale Category Content",anchor_categories,"a:4:{s:8:""entities"";s:4:""sale"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
15-
home-page-block,cms_static_block,"frontend/Magento/luma","Home Page",pages,"a:2:{s:5:""block"";s:7:""content"";s:13:""layout_handle"";s:15:""cms_index_index"";}"
16-
performance-fabrics-block,cms_static_block,"frontend/Magento/luma","Performance Fabrics",anchor_categories,"a:4:{s:8:""entities"";s:15:""performance-new"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
17-
eco-friendly-block,cms_static_block,"frontend/Magento/luma","Eco Friendly",anchor_categories,"a:4:{s:8:""entities"";s:7:""eco-new"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
18-
login-data,cms_static_block,"frontend/Magento/luma","Login Info",pages,"a:5:{s:7:""page_id"";s:1:""0"";s:3:""for"";s:3:""all"";s:13:""layout_handle"";s:22:""customer_account_login"";s:5:""block"";s:24:""customer.login.container"";s:8:""template"";s:33:""widget/static_block/default.phtml"";}"
2+
contact-us-info,cms_static_block,"frontend/Magento/luma","Contact us info",pages,"{""block"":""content.top"",""layout_handle"":""contact_index_index""}"
3+
footer_links_block,cms_static_block,"frontend/Magento/luma","Footer Links",all_pages,"{""block"":""cms_footer_links_container""}"
4+
sale-left-menu-block,cms_static_block,"frontend/Magento/luma","Sale Left Menu",anchor_categories,"{""entities"":""sale"",""block"":""sidebar.main"",""for"":""specific"",""is_anchor_only"":1}"
5+
gear-left-menu-block,cms_static_block,"frontend/Magento/luma","Gear Left Menu",anchor_categories,"{""entities"":""gear"",""block"":""sidebar.main"",""for"":""specific"",""is_anchor_only"":1}"
6+
men-left-menu-block,cms_static_block,"frontend/Magento/luma","Men's Left Menu",anchor_categories,"{""entities"":""men"",""block"":""sidebar.main"",""for"":""specific"",""is_anchor_only"":1}"
7+
women-left-menu-block,cms_static_block,"frontend/Magento/luma","Women's Left Menu",anchor_categories,"{""entities"":""women"",""block"":""sidebar.main"",""for"":""specific"",""is_anchor_only"":1}"
8+
new-left-menu-block,cms_static_block,"frontend/Magento/luma","What's New Left Menu",anchor_categories,"{""entities"":""what-is-new"",""block"":""sidebar.main"",""for"":""specific"",""is_anchor_only"":1}"
9+
women-block,cms_static_block,frontend/Magento/luma,"Women Category Content",anchor_categories,"{""entities"":""women"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
10+
training-block,cms_static_block,frontend/Magento/luma,"Training Category Content",anchor_categories,"{""entities"":""training"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
11+
men-block,cms_static_block,frontend/Magento/luma,"Men Category Content",anchor_categories,"{""entities"":""men"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
12+
gear-block,cms_static_block,frontend/Magento/luma,"Gear Category Content",anchor_categories,"{""entities"":""gear"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
13+
new-block,cms_static_block,frontend/Magento/luma,"New Products Category Content",anchor_categories,"{""entities"":""what-is-new"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
14+
sale-block,cms_static_block,"frontend/Magento/luma","Sale Category Content",anchor_categories,"{""entities"":""sale"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
15+
home-page-block,cms_static_block,"frontend/Magento/luma","Home Page",pages,"{""block"":""content"",""layout_handle"":""cms_index_index""}"
16+
performance-fabrics-block,cms_static_block,"frontend/Magento/luma","Performance Fabrics",anchor_categories,"{""entities"":""performance-new"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
17+
eco-friendly-block,cms_static_block,"frontend/Magento/luma","Eco Friendly",anchor_categories,"{""entities"":""eco-new"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"
18+
login-data,cms_static_block,"frontend/Magento/luma","Login Info",pages,"{""page_id"":""0"",""for"":""all"",""layout_handle"":""customer_account_login"",""block"":""customer.login.container"",""template"":""widget\/static_block\/default.phtml""}"

‎app/code/Magento/WidgetSampleData/fixtures/cmsblock_giftcard.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
block_identifier,type_code,theme_path,title,page_group,group_data
2-
giftcard-block,cms_static_block,frontend/Magento/luma,"Giftcard Category Content",anchor_categories,"a:4:{s:8:""entities"";s:10:""gift-cards"";s:5:""block"";s:11:""content.top"";s:3:""for"";s:8:""specific"";s:14:""is_anchor_only"";i:1;}"
2+
giftcard-block,cms_static_block,frontend/Magento/luma,"Giftcard Category Content",anchor_categories,"{""entities"":""gift-cards"",""block"":""content.top"",""for"":""specific"",""is_anchor_only"":1}"

0 commit comments

Comments
 (0)