Use visibility class for category product indexer, instead of hardcoded values

Author: Nuranto

app/code/Magento/Catalog/Model/Config.php

@@ -8,7 +8,6 @@
 
 use Magento\Eav\Model\ResourceModel\Entity\Type\CollectionFactory;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Catalog\Model\Product\Visibility;
 
 /**
  * Catalog config model.
@@ -115,11 +114,6 @@ class Config extends \Magento\Eav\Model\Config
      */
     protected $_configFactory;
 
-    /**
-     * @var Visibility
-     */
-    protected $_visibility;
-
     /**
      * Constructor
      *
@@ -153,7 +147,6 @@ public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $setCollectionFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig,
-        Visibility $visibility,
         SerializerInterface $serializer = null,
         $attributesForPreload = []
     ) {
@@ -164,7 +157,6 @@ public function __construct(
         $this->_setCollectionFactory = $setCollectionFactory;
         $this->_storeManager = $storeManager;
         $this->_eavConfig = $eavConfig;
-        $this->_visibility = $visibility;
 
         parent::__construct(
             $cache,
@@ -514,9 +506,4 @@ public function getProductListDefaultSortBy($store = null)
             $store
         );
     }
-
-    public function getVisibility()
-    {
-        return $this->_visibility;
-    }
 }

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -15,6 +15,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
+use Magento\Catalog\Model\Product\Visibility;
 
 // phpcs:disable Magento2.Classes.AbstractApi
 /**
@@ -131,6 +132,11 @@ abstract class AbstractAction
      */
     private $currentStore;
 
+    /**
+     * @var Visibility
+     */
+    private $visibility;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -145,7 +151,8 @@ public function __construct(
         \Magento\Catalog\Model\Config $config,
         QueryGenerator $queryGenerator = null,
         MetadataPool $metadataPool = null,
-        TableMaintainer $tableMaintainer = null
+        TableMaintainer $tableMaintainer = null,
+        Visibility $visibility = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -154,6 +161,7 @@ public function __construct(
         $this->queryGenerator = $queryGenerator ?: ObjectManager::getInstance()->get(QueryGenerator::class);
         $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
+        $this->visibility = $visibility ?: ObjectManager::getInstance()->get(Visibility::class);
     }
 
     /**
@@ -348,7 +356,7 @@ protected function getNonAnchorCategoriesSelect(Store $store)
                 \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
             )->where(
                 $this->connection->getIfNullSql('cpvs.value', 'cpvd.value') . ' IN (?)',
-                $this->config->getVisibility()->getVisibleInSiteIds()
+                $this->visibility->getVisibleInSiteIds()
             )->columns(
                 [
                     'category_id' => 'cc.entity_id',
@@ -589,7 +597,7 @@ protected function createAnchorSelect(Store $store)
             \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
         )->where(
             $this->connection->getIfNullSql('cpvs.value', 'cpvd.value') . ' IN (?)',
-            $this->config->getVisibility()->getVisibleInSiteIds()
+            $this->visibility->getVisibleInSiteIds()
         )->where(
             $this->connection->getIfNullSql('ccas.value', 'ccad.value') . ' = ?',
             1
@@ -833,7 +841,7 @@ protected function getAllProducts(Store $store)
                 \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
             )->where(
                 $this->connection->getIfNullSql('cpvs.value', 'cpvd.value') . ' IN (?)',
-                $this->config->getVisibility()->getVisibleInSiteIds()
+                $this->visibility->getVisibleInSiteIds()
             )->group(
                 'cp.entity_id'
             )->columns(