Merge remote-tracking branch 'dragons/MAGETWO-32724' into MAGETWO-35251

Author: Valeriy Nayda

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

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\Plugin\PageCache\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Indexer\Model\CacheContext;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+
+class Action
+{
+    /**
+     * @var CacheContext
+     */
+    protected $cacheContext;
+
+    /**
+     * @var EventManager
+     */
+    protected $eventManager;
+
+    /**
+     * @param CacheContext $cacheContext
+     * @param EventManager $eventManager
+     */
+    public function __construct(
+        CacheContext $cacheContext,
+        EventManager $eventManager
+    ) {
+        $this->cacheContext = $cacheContext;
+        $this->eventManager = $eventManager;
+    }
+
+    /**
+     * @param Product\Action $subject
+     * @param callable $proceed
+     * @param $productIds
+     * @param $attrData
+     * @param $storeId
+     * @return Product\Action
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundUpdateAttributes(
+        Product\Action $subject,
+        \Closure $proceed,
+        $productIds,
+        $attrData,
+        $storeId
+    ) {
+        $returnValue = $proceed($productIds, $attrData, $storeId);
+
+        $this->cacheContext->registerEntities(Product::CACHE_TAG, $productIds);
+        $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
+
+        return $returnValue;
+    }
+}

app/code/Magento/Catalog/Test/Unit/Model/Plugin/PageCache/Product/ActionTest.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Model\Plugin\PageCache\Product;
+
+use Magento\Catalog\Model\Product;
+
+class ActionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAroundUpdateAttributes()
+    {
+        $productIds = [1, 2, 3];
+        $attrData = [];
+        $storeId = 1;
+
+        $productActionMock = $this->getMock('Magento\Catalog\Model\Product\Action', [], [], '', false);
+
+        $cacheContextMock = $this->getMock('Magento\Indexer\Model\CacheContext', [], [], '', false);
+        $cacheContextMock->expects($this->once())
+            ->method('registerEntities')
+            ->with(Product::CACHE_TAG, $productIds);
+
+
+        $eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
+        $eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('clean_cache_by_tags', ['object' => $cacheContextMock]);
+
+        $model = new \Magento\Catalog\Model\Plugin\PageCache\Product\Action($cacheContextMock, $eventManagerMock);
+
+        $closureMock = function () use ($productActionMock) {
+            return $productActionMock;
+        };
+
+        $model->aroundUpdateAttributes($productActionMock, $closureMock, $productIds, $attrData, $storeId);
+    }
+}

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -76,4 +76,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product\Action">
+        <plugin name="invalidate_pagecache_after_update_product_attributes" type="Magento\Catalog\Model\Plugin\PageCache\Product\Action" />
+    </type>
 </config>

app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php

@@ -8,6 +8,8 @@
 
 namespace Magento\CatalogInventory\Model\Indexer\Stock;
 
+use Magento\Catalog\Model\Category;
+
 /**
  * Abstract action reindex class
  *
@@ -52,6 +54,17 @@ abstract class AbstractAction
      */
     protected $_isNeedUseIdxTable = false;
 
+    /**
+     * @var \Magento\Indexer\Model\CacheContext
+     */
+    private $cacheContext;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
+
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\CatalogInventory\Model\Resource\Indexer\StockFactory $indexerFactory
@@ -60,11 +73,16 @@ abstract class AbstractAction
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\CatalogInventory\Model\Resource\Indexer\StockFactory $indexerFactory,
-        \Magento\Catalog\Model\Product\Type $catalogProductType
+        \Magento\Catalog\Model\Product\Type $catalogProductType,
+        \Magento\Indexer\Model\CacheContext $cacheContext,
+        \Magento\Framework\Event\ManagerInterface $eventManager
+
     ) {
         $this->_resource = $resource;
         $this->_indexerFactory = $indexerFactory;
         $this->_catalogProductType = $catalogProductType;
+        $this->cacheContext = $cacheContext;
+        $this->eventManager = $eventManager;
     }
 
     /**
@@ -228,6 +246,16 @@ protected function _reindexRows($productIds = [])
             }
         }
 
+        $select = $adapter->select()
+            ->distinct(true)
+            ->from($this->_getTable('catalog_category_product'), [ 'category_id'])
+            ->where('product_id IN(?)', $processIds);
+
+        $affectedCategories = $adapter->fetchCol($select);
+        $this->cacheContext->registerEntities(Category::CACHE_TAG, $affectedCategories);
+
+        $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
+
         return $this;
     }