Merge remote-tracking branch 'origin/MAGETWO-99677' into 2.3-develop-pr25

Author: serhii-balko

app/code/Magento/Cms/Model/Plugin/Product.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Plugin;
+
+use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Cms\Model\Page;
+
+/**
+ * Cleaning no-route page cache for the product details page after enabling product that is not assigned to a category
+ */
+class Product
+{
+    /**
+     * @var Page
+     */
+    private $page;
+
+    /**
+     * @param Page $page
+     */
+    public function __construct(Page $page)
+    {
+        $this->page = $page;
+    }
+
+    /**
+     * After get identities
+     *
+     * @param CatalogProduct $product
+     * @param array $identities
+     * @return array
+     */
+    public function afterGetIdentities(CatalogProduct $product, array $identities)
+    {
+        if ($product->getOrigData('status') > $product->getData('status')) {
+            if (empty($product->getCategoryIds())) {
+                $noRoutePage = $this->page->load(Page::NOROUTE_PAGE_ID);
+                $noRoutePageId = $noRoutePage->getId();
+                $identities[] = Page::CACHE_TAG . '_' . $noRoutePageId;
+            }
+        }
+
+        return array_unique($identities);
+    }
+}

app/code/Magento/Cms/Test/Unit/Model/Plugin/ProductTest.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\Plugin;
+
+use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\Plugin\Product;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Product plugin test
+ */
+class ProductTest extends TestCase
+{
+    /**
+     * @var Product
+     */
+    private $plugin;
+
+    /**
+     * @var MockObject|CatalogProduct
+     */
+    private $product;
+
+    /**
+     * @var MockObject|Page
+     */
+    private $page;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->product = $this->getMockBuilder(CatalogProduct::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityId', 'getOrigData', 'getData', 'getCategoryIds'])
+            ->getMock();
+
+        $this->page = $this->getMockBuilder(Page::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId', 'load'])
+            ->getMock();
+
+        $this->plugin = $objectManager->getObject(
+            Product::class,
+            [
+                'page' => $this->page
+            ]
+        );
+    }
+
+    public function testAfterGetIdentities()
+    {
+        $baseIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+        ];
+        $id = 12345;
+        $pageId = 1;
+        $expectedIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+            Page::CACHE_TAG . '_' . $pageId,
+        ];
+
+        $this->product->method('getEntityId')
+            ->willReturn($id);
+        $this->product->method('getOrigData')
+            ->with('status')
+            ->willReturn(2);
+        $this->product->method('getData')
+            ->with('status')
+            ->willReturn(1);
+        $this->page->method('getId')
+            ->willReturn(1);
+        $this->page->method('load')
+            ->willReturnSelf();
+
+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
+
+        $this->assertEquals($expectedIdentities, $identities);
+    }
+}

app/code/Magento/Cms/etc/di.xml

@@ -233,5 +233,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product">
+        <plugin name="cms" type="Magento\Cms\Model\Plugin\Product" sortOrder="100"/>
+    </type>
 </config>
-