Merge remote-tracking branch 'github-magento2ce/MAGETWO-91753' into EPAM-PR-14

Author: nikshostko

app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php

@@ -16,8 +16,7 @@
 use Magento\Catalog\Model\Product;
 
 /**
- * Class CustomAttributeFilter
- * Applies filters by custom attributes to base select
+ * Applies filters by custom attributes to base select.
  *
  * @deprecated CatalogSearch will be removed in 2.4, and {@see \Magento\ElasticSearch}
  *             will replace it as the default search engine.
@@ -74,13 +73,13 @@ public function __construct(
      * Applies filters by custom attributes to base select
      *
      * @param Select $select
-     * @param FilterInterface[] ...$filters
+     * @param FilterInterface[] $filters
      * @return Select
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \InvalidArgumentException
      * @throws \DomainException
      */
-    public function apply(Select $select, FilterInterface ... $filters)
+    public function apply(Select $select, FilterInterface ...$filters)
     {
         $select = clone $select;
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
@@ -144,7 +143,6 @@ private function getJoinConditions($attrId, $mainTable, $joinTable)
     {
         return [
             sprintf('`%s`.`entity_id` = `%s`.`entity_id`', $mainTable, $joinTable),
-            sprintf('`%s`.`source_id` = `%s`.`source_id`', $mainTable, $joinTable),
             $this->conditionManager->generateCondition(
                 sprintf('%s.attribute_id', $joinTable),
                 '=',

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php

@@ -155,7 +155,6 @@ private function getSqlForOneAttributeSearch()
 
         $joinConditions = [
             '`some_index`.`entity_id` = `field1_filter`.`entity_id`',
-            '`some_index`.`source_id` = `field1_filter`.`source_id`',
             sprintf('`field1_filter`.`attribute_id` = %s', $firstAttribute->getId()),
             sprintf('`field1_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
         ];
@@ -182,14 +181,12 @@ private function getSqlForTwoAttributeSearch()
 
         $joinConditions1 = [
             '`some_index`.`entity_id` = `field1_filter`.`entity_id`',
-            '`some_index`.`source_id` = `field1_filter`.`source_id`',
             sprintf('`field1_filter`.`attribute_id` = %s', $firstAttribute->getId()),
             sprintf('`field1_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
         ];
 
         $joinConditions2 = [
             '`some_index`.`entity_id` = `field2_filter`.`entity_id`',
-            '`some_index`.`source_id` = `field2_filter`.`source_id`',
             sprintf('`field2_filter`.`attribute_id` = %s', $secondAttribute->getId()),
             sprintf('`field2_filter`.`store_id` = %s', (int) $this->storeManager->getStore()->getId())
         ];