Skip to content

Commit 761396d

Browse files
committed
MAGETWO-94060: [2.3.x] Unlink CatalogWidget from EAV indexer
1 parent 82df2ef commit 761396d

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ public function loadAttributeOptions()
101101

102102
/**
103103
* {@inheritdoc}
104+
*
105+
* @param array &$attributes
106+
* @return void
104107
*/
105108
protected function _addSpecialAttributes(array &$attributes)
106109
{
@@ -228,6 +231,8 @@ protected function addNotGlobalAttribute(
228231

229232
/**
230233
* {@inheritdoc}
234+
*
235+
* @return string
231236
*/
232237
public function getMappedSqlField()
233238
{
@@ -247,6 +252,9 @@ public function getMappedSqlField()
247252

248253
/**
249254
* {@inheritdoc}
255+
*
256+
* @param \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection
257+
* @return $this
250258
*/
251259
public function collectValidatedAttributes($productCollection)
252260
{

app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
2727
*/
2828
private $attributeMock;
2929

30+
/**
31+
* @inheritdoc
32+
*
33+
* @return void
34+
*/
3035
protected function setUp()
3136
{
3237
$objectManagerHelper = new ObjectManager($this);
@@ -60,6 +65,11 @@ protected function setUp()
6065
);
6166
}
6267

68+
/**
69+
* Test addToCollection method.
70+
*
71+
* @return void
72+
*/
6373
public function testAddToCollection()
6474
{
6575
$collectionMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
@@ -83,6 +93,11 @@ public function testAddToCollection()
8393
$this->model->addToCollection($collectionMock);
8494
}
8595

96+
/**
97+
* Test getMappedSqlField method.
98+
*
99+
* @return void
100+
*/
86101
public function testGetMappedSqlFieldSku()
87102
{
88103
$this->model->setAttribute('sku');

app/code/Magento/Rule/Model/Condition/Sql/Builder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ protected function _getMappedSqlCondition(
184184

185185
/**
186186
* @param Combine $combine
187-
* @param string $value
188-
* @param bool $isDefaultStoreUsed
187+
* @param string $value
188+
* @param bool $isDefaultStoreUsed
189189
* @return string
190190
* @SuppressWarnings(PHPMD.NPathComplexity)
191191
* @throws \Magento\Framework\Exception\LocalizedException

0 commit comments

Comments
 (0)