Skip to content

Commit a5cdd10

Browse files
author
vnayda
committed
MAGETWO-59950: Configurable product option price is displayed incorrectly per website - for 2.0.x
- fix builds
1 parent ad01872 commit a5cdd10

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/StatusBaseSelectProcessorTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
use Magento\Store\Api\StoreResolverInterface;
1818
use Magento\Store\Model\Store;
1919

20+
/**
21+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
22+
*/
2023
class StatusBaseSelectProcessorTest extends \PHPUnit_Framework_TestCase
2124
{
2225
/**
@@ -91,8 +94,8 @@ public function testProcess()
9194
->with(
9295
['status_attr' => $backendTable],
9396
"status_attr.entity_id = " . BaseSelectProcessorInterface::PRODUCT_RELATION_ALIAS . ".child_id"
94-
. " AND status_attr.attribute_id = {$attributeId}"
95-
. " AND status_attr.store_id = {$currentStoreId}",
97+
. " AND status_attr.attribute_id = {$attributeId}"
98+
. " AND status_attr.store_id = {$currentStoreId}",
9699
[]
97100
)
98101
->willReturnSelf();

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
use Magento\Store\Api\StoreResolverInterface;
1313
use Magento\Store\Model\Store;
1414

15+
/**
16+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
17+
*/
1518
class Configurable extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice
1619
{
1720
/**
@@ -28,6 +31,7 @@ class Configurable extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\
2831
* @param \Magento\Framework\Event\ManagerInterface $eventManager
2932
* @param \Magento\Framework\Module\Manager $moduleManager
3033
* @param string $connectionName
34+
* @param StoreResolverInterface $storeResolver
3135
*/
3236
public function __construct(
3337
\Magento\Framework\Model\ResourceModel\Db\Context $context,

0 commit comments

Comments
 (0)