Skip to content

Commit edb406d

Browse files
committed
MAGETWO-63945: Add extension point to sales grid indexer
- Rename IdListProviderComposite to IdListProvider - Fix static
1 parent 6159299 commit edb406d

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function getGridTable()
6767
{
6868
return $this->getTable($this->gridTableName);
6969
}
70+
7071
/**
7172
* Purge grid row
7273
*

app/code/Magento/Sales/Model/ResourceModel/Provider/IdListProviderComposite.php renamed to app/code/Magento/Sales/Model/ResourceModel/Provider/IdListProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Implements IdListProviderInterface as composite
1212
*/
13-
class IdListProviderComposite implements IdListProviderInterface
13+
class IdListProvider implements IdListProviderInterface
1414
{
1515
/**
1616
* @var IdListProviderInterface[]

app/code/Magento/Sales/Model/ResourceModel/Provider/IdListProviderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Sales\Model\ResourceModel\Provider;
77

88
/**
9-
* Interface provides entities ids list that should be updated in grid
9+
* Interface provides entities id list that should be updated in grid
1010
*/
1111
interface IdListProviderInterface
1212
{

app/code/Magento/Sales/Model/ResourceModel/Provider/UpdatedIdListProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ private function getLastUpdatedAtValue($gridTableName)
6262
*/
6363
private function getConnection()
6464
{
65-
return $this->resourceConnection->getConnection('sales');
65+
return $this->resourceConnection->getConnection();
6666
}
6767
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
use Magento\Framework\ObjectManager\TMap;
99
use Magento\Framework\ObjectManager\TMapFactory;
10-
use Magento\Sales\Model\ResourceModel\Provider\IdListProviderComposite;
10+
use Magento\Sales\Model\ResourceModel\Provider\IdListProvider;
1111
use Magento\Sales\Model\ResourceModel\Provider\IdListProviderInterface;
1212
use PHPUnit_Framework_MockObject_MockObject as MockObject;
1313

1414
/**
15-
* Class IdListProviderCompositeTest
15+
* Class IdListProviderTest
1616
*/
17-
class IdListProviderCompositeTest extends \PHPUnit_Framework_TestCase
17+
class IdListProviderTest extends \PHPUnit_Framework_TestCase
1818
{
1919
public function testGetEmpty()
2020
{
@@ -40,12 +40,12 @@ public function testGetEmpty()
4040
->method('getIterator')
4141
->willReturn(new \ArrayIterator([]));
4242

43-
$provider = new IdListProviderComposite($tMapFactory, []);
43+
$provider = new IdListProvider($tMapFactory, []);
4444
static::assertEquals([], $provider->get('main_table', 'grid_table'));
4545
}
4646

4747
/**
48-
* @covers \Magento\Sales\Model\ResourceModel\Provider\IdListProviderComposite::get
48+
* @covers \Magento\Sales\Model\ResourceModel\Provider\IdListProvider::get
4949
*/
5050
public function testGet()
5151
{
@@ -86,7 +86,7 @@ public function testGet()
8686
->method('getIterator')
8787
->willReturn(new \ArrayIterator([$provider1, $provider2]));
8888

89-
$provider = new IdListProviderComposite(
89+
$provider = new IdListProvider(
9090
$tMapFactory,
9191
[
9292
'provider1' => IdListProviderInterface::class,

app/code/Magento/Sales/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
<preference for="Magento\Sales\Model\Order\Creditmemo\NotifierInterface" type="Magento\Sales\Model\Order\Creditmemo\Notifier"/>
114114
<preference for="Magento\Sales\Api\RefundOrderInterface" type="Magento\Sales\Model\RefundOrder"/>
115115
<preference for="Magento\Sales\Api\RefundInvoiceInterface" type="Magento\Sales\Model\RefundInvoice"/>
116-
<preference for="Magento\Sales\Model\ResourceModel\Provider\IdListProviderInterface" type="Magento\Sales\Model\ResourceModel\Provider\IdListProviderComposite" />
117-
<type name="Magento\Sales\Model\ResourceModel\Provider\IdListProviderComposite">
116+
<preference for="Magento\Sales\Model\ResourceModel\Provider\IdListProviderInterface" type="Magento\Sales\Model\ResourceModel\Provider\IdListProvider" />
117+
<type name="Magento\Sales\Model\ResourceModel\Provider\IdListProvider">
118118
<arguments>
119119
<argument name="providers" xsi:type="array">
120120
<item name="default" xsi:type="string">Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider</item>

dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/GridTest.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Sales\Model\ResourceModel;
77

8+
use Magento\Sales\Model\ResourceModel\Order\Grid\Collection;
9+
use Magento\TestFramework\Helper\Bootstrap;
10+
811
/**
912
* Class GridTest
1013
*/
@@ -22,7 +25,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
2225

2326
protected function setUp()
2427
{
25-
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
28+
$this->objectManager = Bootstrap::getObjectManager();
2629
$this->resourceModel = $this->objectManager->create('Magento\Sales\Model\ResourceModel\Order\Grid');
2730
}
2831

@@ -58,16 +61,14 @@ public function testRefreshByScheduleSyncModeSuccess()
5861
}
5962

6063
/**
61-
* Returns value of signifyd_guarantee_status column from sales order grid
64+
* Returns sales order grid items
6265
*
63-
* @return string|null
66+
* @return \Magento\Framework\DataObject[]
6467
*/
6568
private function getOrderGridItemList()
6669
{
67-
/** @var \Magento\Sales\Model\ResourceModel\Order\Grid\Collection $orderGridCollection */
68-
$orderGridCollection = $this->objectManager->get(
69-
\Magento\Sales\Model\ResourceModel\Order\Grid\Collection::class
70-
);
70+
/** @var Collection $orderGridCollection */
71+
$orderGridCollection = $this->objectManager->get(Collection::class);
7172

7273
return $orderGridCollection->addFilter('increment_id', '100000001')->getItems();
7374
}

0 commit comments

Comments
 (0)