Merge remote-tracking branch 'origin/MAGETWO-48128' into MAGETWO-47783

Author: maxwhite-ua

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -399,13 +399,12 @@ protected function addFilterGroupToCollection(
         \Magento\Customer\Model\ResourceModel\Customer\Collection $collection
     ) {
         $fields = [];
-        $conditions = [];
         foreach ($filterGroup->getFilters() as $filter) {
             $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
             $fields[] = ['attribute' => $filter->getField(), $condition => $filter->getValue()];
         }
         if ($fields) {
-            $collection->addFieldToFilter($fields, $conditions);
+            $collection->addFieldToFilter($fields);
         }
     }
 }

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php

@@ -722,7 +722,7 @@ public function testGetList()
             ->willReturn([$filterGroup]);
         $collection->expects($this->once())
             ->method('addFieldToFilter')
-            ->with([['attribute' => 'Field', 'eq' => 'Value']], []);
+            ->with([['attribute' => 'Field', 'eq' => 'Value']]);
         $filterGroup->expects($this->once())
             ->method('getFilters')
             ->willReturn([$filter]);