Skip to content

Commit 7e45f4c

Browse files
danmooney2danmooney2
committed
MAGETWO-92520: Build stabilization
Change additional data section of expected merged array to pass ReaderTest::testMerge
1 parent 42bb2d1 commit 7e45f4c

File tree

1 file changed

+119
-23
lines changed

1 file changed

+119
-23
lines changed

‎dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php

Lines changed: 119 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -86,32 +86,128 @@
8686
],
8787
'additional_data' => [
8888
'config1' => [
89-
'settingWithTypeString' => 'string',
90-
'settingWithTypeObject' => 'test data',
91-
'settingWithTypeNull' => null,
92-
'settingWithTypeInteger' => '20',
93-
'settingWithTypeBooleanTrue' => true,
94-
'settingWithTypeBooleanFalse' => false,
95-
'settingWithTypeNumber2' => '-90'
89+
'name' => 'config1',
90+
'xsi:type' => 'array',
91+
'item' => [
92+
'settingWithTypeString' => [
93+
'name' => 'settingWithTypeString',
94+
'xsi:type' => 'string',
95+
'value' => 'string',
96+
],
97+
'settingWithTypeBooleanTrue' => [
98+
'name' => 'settingWithTypeBooleanTrue',
99+
'xsi:type' => 'boolean',
100+
'value' => 'true',
101+
],
102+
'settingWithTypeBooleanFalse' => [
103+
'name' => 'settingWithTypeBooleanFalse',
104+
'xsi:type' => 'boolean',
105+
'value' => 'false',
106+
],
107+
'settingWithTypeInteger' => [
108+
'name' => 'settingWithTypeInteger',
109+
'xsi:type' => 'number',
110+
'value' => '20',
111+
],
112+
'settingWithTypeNull' => [
113+
'name' => 'settingWithTypeNull',
114+
'xsi:type' => 'null',
115+
],
116+
'settingWithTypeNumber2' => [
117+
'name' => 'settingWithTypeNumber2',
118+
'xsi:type' => 'number',
119+
'value' => '-90',
120+
],
121+
'settingWithTypeObject' => [
122+
'name' => 'settingWithTypeObject',
123+
'xsi:type' => 'object',
124+
'value' => 'Magento\\TestModulePageBuilderDataMigration\\Model\\Config\\'
125+
. 'ContentType\\AdditionalData\\Provider\\TestData',
126+
],
127+
],
96128
],
97129
'config2' => [
98-
'arrayConfig' => [
99-
'settingWithTypeString' => 'string',
100-
'settingWithTypeObject' => 'test data',
101-
'settingWithTypeNull' => null,
102-
'settingWithTypeInteger' => '20',
103-
'settingWithTypeBooleanTrue' => true,
104-
'settingWithTypeBooleanFalse' => false,
105-
'settingWithTypeNumber2' => '-90'
106-
]
130+
'name' => 'config2',
131+
'xsi:type' => 'array',
132+
'item' => [
133+
'arrayConfig' => [
134+
'name' => 'arrayConfig',
135+
'xsi:type' => 'array',
136+
'item' => [
137+
'settingWithTypeString' => [
138+
'name' => 'settingWithTypeString',
139+
'xsi:type' => 'string',
140+
'value' => 'string',
141+
],
142+
'settingWithTypeBooleanTrue' => [
143+
'name' => 'settingWithTypeBooleanTrue',
144+
'xsi:type' => 'boolean',
145+
'value' => 'true',
146+
],
147+
'settingWithTypeBooleanFalse' => [
148+
'name' => 'settingWithTypeBooleanFalse',
149+
'xsi:type' => 'boolean',
150+
'value' => 'false',
151+
],
152+
'settingWithTypeInteger' => [
153+
'name' => 'settingWithTypeInteger',
154+
'xsi:type' => 'number',
155+
'value' => '20',
156+
],
157+
'settingWithTypeNull' => [
158+
'name' => 'settingWithTypeNull',
159+
'xsi:type' => 'null',
160+
],
161+
'settingWithTypeNumber2' => [
162+
'name' => 'settingWithTypeNumber2',
163+
'xsi:type' => 'number',
164+
'value' => '-90',
165+
],
166+
'settingWithTypeObject' => [
167+
'name' => 'settingWithTypeObject',
168+
'xsi:type' => 'object',
169+
'value' => 'Magento\\TestModulePageBuilderDataMigration\\Model\\Config\\'
170+
. 'ContentType\\AdditionalData\\Provider\\TestData',
171+
],
172+
],
173+
],
174+
],
175+
],
176+
'settingWithTypeString' => [
177+
'name' => 'settingWithTypeString',
178+
'xsi:type' => 'string',
179+
'value' => 'string',
180+
],
181+
'settingWithTypeBooleanTrue' => [
182+
'name' => 'settingWithTypeBooleanTrue',
183+
'xsi:type' => 'boolean',
184+
'value' => 'true',
185+
],
186+
'settingWithTypeBooleanFalse' => [
187+
'name' => 'settingWithTypeBooleanFalse',
188+
'xsi:type' => 'boolean',
189+
'value' => 'false',
190+
],
191+
'settingWithTypeInteger' => [
192+
'name' => 'settingWithTypeInteger',
193+
'xsi:type' => 'number',
194+
'value' => '20',
195+
],
196+
'settingWithTypeNull' => [
197+
'name' => 'settingWithTypeNull',
198+
'xsi:type' => 'null',
199+
],
200+
'settingWithTypeNumber2' => [
201+
'name' => 'settingWithTypeNumber2',
202+
'xsi:type' => 'number',
203+
'value' => '-90',
204+
],
205+
'settingWithTypeObject' => [
206+
'name' => 'settingWithTypeObject',
207+
'xsi:type' => 'object',
208+
'value' => 'Magento\\TestModulePageBuilderDataMigration\\Model\\Config\\'
209+
. 'ContentType\\AdditionalData\\Provider\\TestData',
107210
],
108-
'settingWithTypeString' => 'string',
109-
'settingWithTypeObject' => 'test data',
110-
'settingWithTypeNull' => null,
111-
'settingWithTypeInteger' => '20',
112-
'settingWithTypeBooleanTrue' => true,
113-
'settingWithTypeBooleanFalse' => false,
114-
'settingWithTypeNumber2' => '-90'
115211
],
116212
],
117213
'type2' => [

0 commit comments

Comments
 (0)