Skip to content

Commit ccc0a83

Browse files
author
Timon de Groot
committed
Fix static tests
1 parent 0b77392 commit ccc0a83

File tree

2 files changed

+29
-22
lines changed
  • app/code/Magento/Catalog
    • Controller/Adminhtml/Product/Initialization
    • Test/Unit/Controller/Adminhtml/Product/Initialization

2 files changed

+29
-22
lines changed

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public function initializeFromData(Product $product, array $productData)
216216
}
217217
$productData['tier_price'] = isset($productData['tier_price']) ? $productData['tier_price'] : [];
218218

219-
$useDefaults = (array)$this->request->getPost('use_default', []);
219+
$useDefaults = (array) $this->request->getPost('use_default', []);
220220
$productData = $this->attributeFilter->prepareProductAttributes($product, $productData, $useDefaults);
221221
$product->addData($productData);
222222

@@ -276,7 +276,7 @@ protected function setProductLinks(Product $product)
276276

277277
foreach ($linkTypes as $linkType => $readonly) {
278278
if (isset($links[$linkType]) && !$readonly) {
279-
foreach ((array)$links[$linkType] as $linkData) {
279+
foreach ((array) $links[$linkType] as $linkData) {
280280
if (empty($linkData['id'])) {
281281
continue;
282282
}
@@ -286,7 +286,7 @@ protected function setProductLinks(Product $product)
286286
$link->setSku($product->getSku())
287287
->setLinkedProductSku($linkProduct->getSku())
288288
->setLinkType($linkType)
289-
->setPosition(isset($linkData['position']) ? (int)$linkData['position'] : 0);
289+
->setPosition(isset($linkData['position']) ? (int) $linkData['position'] : 0);
290290
$productLinks[] = $link;
291291
}
292292
}
@@ -422,7 +422,7 @@ private function getDateTimeFilter()
422422
private function filterWebsiteIds($websiteIds)
423423
{
424424
if (!$this->storeManager->isSingleStoreMode()) {
425-
$websiteIds = array_filter((array)$websiteIds);
425+
$websiteIds = array_filter((array) $websiteIds);
426426
} else {
427427
$websiteIds[$this->storeManager->getWebsite(true)->getId()] = 1;
428428
}
@@ -463,9 +463,12 @@ private function fillProductOptions(Product $product, array $productOptions)
463463
}
464464

465465
if (isset($customOptionData['values'])) {
466-
$customOptionData['values'] = array_filter($customOptionData['values'], function ($valueData) {
467-
return empty($valueData['is_delete']);
468-
});
466+
$customOptionData['values'] = array_filter(
467+
$customOptionData['values'],
468+
function ($valueData) {
469+
return empty($valueData['is_delete']);
470+
}
471+
);
469472
}
470473

471474
if (isset($customOptionData['price'])) {

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,18 @@ public function testInitialize(
289289
$secondExpectedCustomOption->setData($optionsData['option3']);
290290
$this->customOptionFactoryMock->expects($this->any())
291291
->method('create')
292-
->willReturnMap([
292+
->willReturnMap(
293293
[
294-
['data' => $optionsData['option2']],
295-
$firstExpectedCustomOption,
296-
],
297-
[
298-
['data' => $optionsData['option3']],
299-
$secondExpectedCustomOption,
300-
],
301-
]);
294+
[
295+
['data' => $optionsData['option2']],
296+
$firstExpectedCustomOption,
297+
],
298+
[
299+
['data' => $optionsData['option3']],
300+
$secondExpectedCustomOption,
301+
],
302+
]
303+
);
302304
$website = $this->getMockBuilder(WebsiteInterface::class)->getMockForAbstractClass();
303305
$website->expects($this->any())->method('getId')->willReturn(1);
304306
$this->storeManagerMock->expects($this->once())->method('isSingleStoreMode')->willReturn($isSingleStore);
@@ -311,12 +313,14 @@ public function testInitialize(
311313

312314
$this->productLinkFactoryMock->expects($this->any())
313315
->method('create')
314-
->willReturnCallback(function () {
315-
return $this->getMockBuilder(ProductLink::class)
316-
->setMethods(null)
317-
->disableOriginalConstructor()
318-
->getMock();
319-
});
316+
->willReturnCallback(
317+
function () {
318+
return $this->getMockBuilder(ProductLink::class)
319+
->setMethods(null)
320+
->disableOriginalConstructor()
321+
->getMock();
322+
}
323+
);
320324

321325
$this->attributeFilterMock->expects($this->any())->method('prepareProductAttributes')->willReturnArgument(1);
322326

0 commit comments

Comments
 (0)