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

Author: Oleksandr Karpenko

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

@@ -75,8 +75,8 @@ public function apply(Collection $collection, Filter $filter)
             throw new \InvalidArgumentException('Database collection required.');
         }
 
+        /** @var SearchResult $collection */
         $mainTable = $collection->getMainTable();
-        /** @var AbstractDb $collection */
         $columns = $this->getFulltextIndexColumns($collection, $mainTable);
         if (!$columns) {
             return;

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

@@ -19,6 +19,7 @@
 use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\Api\Filter;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb as ResourceModelAbstractDb;
 use Magento\Framework\Mview\View\Collection as MviewCollection;
 
 /**
@@ -62,14 +63,24 @@ class FulltextFilterTest extends \PHPUnit_Framework_TestCase
      */
     protected $collectionAbstractDbMock;
 
+    /**
+     * @var ResourceModelAbstractDb|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resourceModelAbstractDb;
+
     protected function setUp()
     {
         $this->entityFactoryMock = $this->getMock(EntityFactory::class, [], [], '', false);
         $this->loggerMock = $this->getMock(LoggerInterface::class);
         $this->fetchStrategyMock = $this->getMock(FetchStrategyInterface::class, [], [], '', false);
+        $this->resourceModelAbstractDb = $this->getMock(FetchStrategyInterface::class, [], [], '', false);
         $this->connectionMock = $this->getMock(Mysql::class, ['select', 'getIndexList'], [], '', false);
         $this->selectMock = $this->getMock(Select::class, ['getPart', 'where'], [], '', false);
 
+        $this->resourceModelAbstractDb = $this->getMockBuilder(ResourceModelAbstractDb::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->collectionAbstractDbMock = $this->getMockBuilder(CollectionAbstractDb::class)
             ->setMethods(['getConnection', 'getSelect', 'getMainTable'])
             ->disableOriginalConstructor()
@@ -83,7 +94,7 @@ public function testApply()
         $filter = new Filter();
         $filter->setValue('test');
 
-        $this->connectionMock->expects($this->any())
+        $this->collectionAbstractDbMock->expects($this->any())
             ->method('getMainTable')
             ->willReturn('testTable');