Skip to content

Commit fadadb8

Browse files
author
Oleksii Korshenko
committed
MAGETWO-70866: Enabling the use of looping (for in ..) into Template.php #9401
- fixed code style
1 parent ad535b1 commit fadadb8

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public function getThings()
5454
['name' => 'Jane', 'age' => 12],
5555
['name' => 'Spot', 'age' => 7],
5656
];
57-
5857
}
5958

6059
/**
@@ -94,7 +93,8 @@ public function getFilterForDataProvider()
9493
<ul>
9594
{{for item in order.all_visible_items}}
9695
<li>
97-
index: {{var loop.index}} sku: {{var item.sku}} name: {{var item.name}} price: {{var item.price}} quantity: {{var item.ordered_qty}}
96+
index: {{var loop.index}} sku: {{var item.sku}}
97+
name: {{var item.name}} price: {{var item.price}} quantity: {{var item.ordered_qty}}
9898
</li>
9999
{{/for}}
100100
</ul>
@@ -104,7 +104,8 @@ public function getFilterForDataProvider()
104104
<ul>
105105
106106
<li>
107-
index: 0 sku: ABC123 name: Product ABC price: 123 quantity: 2
107+
index: 0 sku: ABC123
108+
name: Product ABC price: 123 quantity: 2
108109
</li>
109110
110111
</ul>

lib/internal/Magento/Framework/Filter/Test/Unit/TemplateTest.php

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,25 +186,21 @@ public function varDirectiveDataProvider()
186186
*/
187187
public function testLoopPattern($construction, $variables, $expectedResult)
188188
{
189-
190189
$this->templateFilter->setVariables($variables);
191190
$this->assertEquals($expectedResult, $this->invokeMethod($this->templateFilter, 'filterFor', [$construction]));
192191
}
193192

194-
195193
/**
196194
* @return array
197195
*/
198196
public function loopPatternDataProvider()
199197
{
200-
201198
return [
202199
'no loop tag' => $this->getTemplateAndExpectedResults('noLoopTag'),
203200
'no loop body tag' => $this->getTemplateAndExpectedResults('noBodyTag'),
204201
'no item tag' => $this->getTemplateAndExpectedResults('noItemTag'),
205202
'no item, no body tags' => $this->getTemplateAndExpectedResults('noItemNoBodyTag'),
206203
'no item, no data, no body tags' => $this->getTemplateAndExpectedResults('noItemNoDataNoBodyTag'),
207-
208204
];
209205
}
210206

@@ -232,7 +228,6 @@ private function invokeMethod(&$object, $methodName, array $parameters = [])
232228
*/
233229
public function getTemplateAndExpectedResults($type)
234230
{
235-
236231
switch ($type) {
237232
case 'noLoopTag':
238233
$template = $expected = '';
@@ -306,7 +301,8 @@ public function getTemplateAndExpectedResults($type)
306301
<ul>
307302
{{for item in order.all_visible_items}}
308303
<li>
309-
index: {{var loop.index}} sku: {{var item.sku}} name: {{var item.name}} price: {{var item.price}} quantity: {{var item.ordered_qty}}
304+
index: {{var loop.index}} sku: {{var item.sku}}
305+
name: {{var item.name}} price: {{var item.price}} quantity: {{var item.ordered_qty}}
310306
</li>
311307
{{/for}}
312308
</ul>
@@ -315,22 +311,19 @@ public function getTemplateAndExpectedResults($type)
315311
<ul>
316312
317313
<li>
318-
index: 0 sku: ABC123 name: Product ABC price: 123 quantity: 2
314+
index: 0 sku: ABC123
315+
name: Product ABC price: 123 quantity: 2
319316
</li>
320317
321318
<li>
322-
index: 1 sku: DOREMI name: Product DOREMI price: 456 quantity: 1
319+
index: 1 sku: DOREMI
320+
name: Product DOREMI price: 456 quantity: 1
323321
</li>
324322
325323
</ul>
326324
TEMPLATE;
327-
328325
}
329-
return [
330-
$template,
331-
['order' => $this->getObjectData()],
332-
$expected
333-
];
326+
return [$template, ['order' => $this->getObjectData()], $expected];
334327
}
335328

336329
/**
@@ -339,7 +332,7 @@ public function getTemplateAndExpectedResults($type)
339332
private function getObjectData()
340333
{
341334
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
342-
$dataObject = $objectManager->getObject('\Magento\Framework\DataObject');
335+
$dataObject = $objectManager->getObject(\Magento\Framework\DataObject::class);
343336

344337
/* $var @dataObject \Magento\Framework\DataObject */
345338

0 commit comments

Comments
 (0)