Merge remote-tracking branch 'origin/MAGETWO-95692' into 2.3-develop-pr11

Author: serhii-balko

app/code/Magento/Customer/Model/Indexer/Source.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model\Indexer;
 
+use Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory;
 use Magento\Customer\Model\ResourceModel\Customer\Indexer\Collection;
 use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
 use Traversable;
@@ -25,35 +26,35 @@ class Source implements \IteratorAggregate, \Countable, SourceProviderInterface
     private $batchSize;
 
     /**
-     * @param \Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory $collection
+     * @param CollectionFactory $collectionFactory
      * @param int $batchSize
      */
     public function __construct(
-        \Magento\Customer\Model\ResourceModel\Customer\Indexer\CollectionFactory $collectionFactory,
+        CollectionFactory $collectionFactory,
         $batchSize = 10000
     ) {
         $this->customerCollection = $collectionFactory->create();
         $this->batchSize = $batchSize;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMainTable()
     {
         return $this->customerCollection->getMainTable();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getIdFieldName()
     {
         return $this->customerCollection->getIdFieldName();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addFieldToSelect($fieldName, $alias = null)
     {
@@ -62,15 +63,15 @@ public function addFieldToSelect($fieldName, $alias = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSelect()
     {
         return $this->customerCollection->getSelect();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addFieldToFilter($attribute, $condition = null)
     {
@@ -79,7 +80,7 @@ public function addFieldToFilter($attribute, $condition = null)
     }
 
     /**
-     * @return int
+     * @inheritdoc
      */
     public function count()
     {
@@ -105,4 +106,28 @@ public function getIterator()
             $pageNumber++;
         } while ($pageNumber <= $lastPage);
     }
+
+    /**
+     * Joins Attribute
+     *
+     * @param string $alias alias for the joined attribute
+     * @param string|\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
+     * @param string $bind attribute of the main entity to link with joined $filter
+     * @param string|null $filter primary key for the joined entity (entity_id default)
+     * @param string $joinType inner|left
+     * @param int|null $storeId
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @see Collection::joinAttribute()
+     */
+    public function joinAttribute(
+        string $alias,
+        $attribute,
+        string $bind,
+        ?string $filter = null,
+        string $joinType = 'inner',
+        ?int $storeId = null
+    ): void {
+        $this->customerCollection->joinAttribute($alias, $attribute, $bind, $filter, $joinType, $storeId);
+    }
 }