Skip to content

Commit 9d7ad13

Browse files
committed
MAGETWO-60483: Catalog broken when all child products of configurable are disabled
- Fixes after code review;
1 parent 5b8eb94 commit 9d7ad13

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class FinalPriceBox extends BasePriceBox
3636
* @param RendererPool $rendererPool
3737
* @param array $data
3838
* @param SalableResolverInterface $salableResolver
39-
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
4039
*/
4140
public function __construct(
4241
Context $context,
@@ -46,7 +45,7 @@ public function __construct(
4645
array $data = [],
4746
SalableResolverInterface $salableResolver = null
4847
) {
49-
parent::__construct($context, $saleableItem, $price, $rendererPool);
48+
parent::__construct($context, $saleableItem, $price, $rendererPool, $data);
5049
$this->salableResolver = $salableResolver ?: \Magento\Framework\App\ObjectManager::getInstance()
5150
->get(SalableResolverInterface::class);
5251
}

app/code/Magento/Catalog/Test/Unit/Model/Product/Pricing/Renderer/SalableResolverTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ protected function setUp()
3434
);
3535
}
3636

37-
public function testSalableItemDoesntExists()
38-
{
39-
$this->product = null;
40-
41-
$result = $this->object->isSalable($this->product);
42-
$this->assertFalse($result);
43-
}
44-
4537
public function testSalableItem()
4638
{
4739
$this->product->expects($this->any())

0 commit comments

Comments
 (0)