Skip to content

Commit 9a7684e

Browse files
author
Oleksandr Karpenko
committed
Merge remote-tracking branch 'origin/MAGETWO-49708' into BUGS
Conflicts: lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/FulltextFilterTest.php
2 parents 4f13fae + 854cfde commit 9a7684e

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public function apply(Collection $collection, Filter $filter)
7575
throw new \InvalidArgumentException('Database collection required.');
7676
}
7777

78+
/** @var SearchResult $collection */
7879
$mainTable = $collection->getMainTable();
79-
/** @var AbstractDb $collection */
8080
$columns = $this->getFulltextIndexColumns($collection, $mainTable);
8181
if (!$columns) {
8282
return;

lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/FulltextFilterTest.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Magento\Framework\Data\Collection\EntityFactory;
2020
use Magento\Framework\DB\Adapter\Pdo\Mysql;
2121
use Magento\Framework\Api\Filter;
22+
use Magento\Framework\Model\ResourceModel\Db\AbstractDb as ResourceModelAbstractDb;
2223
use Magento\Framework\Mview\View\Collection as MviewCollection;
2324

2425
/**
@@ -62,14 +63,24 @@ class FulltextFilterTest extends \PHPUnit_Framework_TestCase
6263
*/
6364
protected $collectionAbstractDbMock;
6465

66+
/**
67+
* @var ResourceModelAbstractDb|\PHPUnit_Framework_MockObject_MockObject
68+
*/
69+
protected $resourceModelAbstractDb;
70+
6571
protected function setUp()
6672
{
6773
$this->entityFactoryMock = $this->getMock(EntityFactory::class, [], [], '', false);
6874
$this->loggerMock = $this->getMock(LoggerInterface::class);
6975
$this->fetchStrategyMock = $this->getMock(FetchStrategyInterface::class, [], [], '', false);
76+
$this->resourceModelAbstractDb = $this->getMock(FetchStrategyInterface::class, [], [], '', false);
7077
$this->connectionMock = $this->getMock(Mysql::class, ['select', 'getIndexList'], [], '', false);
7178
$this->selectMock = $this->getMock(Select::class, ['getPart', 'where'], [], '', false);
7279

80+
$this->resourceModelAbstractDb = $this->getMockBuilder(ResourceModelAbstractDb::class)
81+
->disableOriginalConstructor()
82+
->getMockForAbstractClass();
83+
7384
$this->collectionAbstractDbMock = $this->getMockBuilder(CollectionAbstractDb::class)
7485
->setMethods(['getConnection', 'getSelect', 'getMainTable'])
7586
->disableOriginalConstructor()
@@ -83,7 +94,7 @@ public function testApply()
8394
$filter = new Filter();
8495
$filter->setValue('test');
8596

86-
$this->connectionMock->expects($this->any())
97+
$this->collectionAbstractDbMock->expects($this->any())
8798
->method('getMainTable')
8899
->willReturn('testTable');
89100

0 commit comments

Comments
 (0)