MAGETWO-52558: Cache is not invalidated or refreshed when product website visibility changes

Author: Yaroslav Onischenko

app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php

@@ -46,7 +46,10 @@ public function execute(array $entityIds = [], $useTempTable = false)
     }
 
     /**
+     * Register affected products
+     * 
      * @param array $entityIds
+     * @return void
      */
     private function registerProducts($entityIds)
     {
@@ -65,10 +68,11 @@ private function registerCategories($entityIds)
             $this->connection->select()
                 ->from($this->getMainTable(), ['category_id'])
                 ->where('product_id IN (?)', $entityIds)
+                ->distinct()
         );
 
         if ($categories) {
-            $this->getCacheContext()->registerEntities(Category::CACHE_TAG, array_unique($categories));
+            $this->getCacheContext()->registerEntities(Category::CACHE_TAG, $categories);
         }
     }
 
@@ -137,7 +141,7 @@ protected function isRangingNeeded()
      * @return \Magento\Framework\Indexer\CacheContext
      * @deprecated
      */
-    protected function getCacheContext()
+    private function getCacheContext()
     {
         if ($this->cacheContext === null) {
             $this->cacheContext = \Magento\Framework\App\ObjectManager::getInstance()->get(CacheContext::class);

app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php

@@ -50,7 +50,7 @@ public function afterUpdateAttributes(
 
     /**
      * @param Action $subject
-     * @return Action
+     * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */