MAGETWO-83204: "Hide from Product Page" option does not work for child of configurable product

Author: dhorytskyi

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

@@ -1058,7 +1058,7 @@ protected function _afterLoad()
      */
     public function cleanCache()
     {
-        return parent::cleanModelCache();
+        return $this->cleanModelCache();
     }
 
     /**

app/code/Magento/ConfigurableProduct/Model/Plugin/ProductIdentitiesExtender.php

@@ -38,20 +38,19 @@ public function __construct(Configurable $configurableType, ProductRepositoryInt
      * Add parent identities to product identities
      *
      * @param Product $subject
-     * @param \Closure $proceed
+     * @param array $identities
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundGetIdentities(Product $subject, \Closure $proceed)
+    public function afterGetIdentities(Product $subject, $identities)
     {
-        $identities = $proceed();
+        $identities = (array) $identities;
 
         foreach ($this->configurableType->getParentIdsByChild($subject->getId()) as $parentId) {
             $parentProduct = $this->productRepository->getById($parentId);
-            $identities = array_merge($identities, $parentProduct->getIdentities());
+            $identities = array_merge($identities, (array) $parentProduct->getIdentities());
         }
-        $identities = array_unique($identities);
 
-        return $identities;
+        return array_unique($identities);
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductIdentitiesExtenderTest.php

@@ -41,29 +41,26 @@ protected function setUp()
         $this->plugin = new ProductIdentitiesExtender($this->configurableTypeMock, $this->productRepositoryMock);
     }
 
-    public function testAroundGetIdentities()
+    public function testAfterGetIdentities()
     {
+        $productId = 1;
         $productIdentity = 'cache_tag_1';
         $productMock = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $proceed = function () use ($productIdentity) {
-            return [$productIdentity];
-        };
-
-        $productId = 1;
         $parentProductId = 2;
         $parentProductIdentity = 'cache_tag_2';
+        $parentProductMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $productMock->expects($this->once())
             ->method('getId')
             ->willReturn($productId);
         $this->configurableTypeMock->expects($this->once())
             ->method('getParentIdsByChild')
             ->with($productId)
             ->willReturn([$parentProductId]);
-        $parentProductMock = $this->getMockBuilder(Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->productRepositoryMock->expects($this->once())
             ->method('getById')
             ->with($parentProductId)
@@ -72,7 +69,7 @@ public function testAroundGetIdentities()
             ->method('getIdentities')
             ->willReturn([$parentProductIdentity]);
 
-        $productIdentities = $this->plugin->aroundGetIdentities($productMock, $proceed);
+        $productIdentities = $this->plugin->afterGetIdentities($productMock, [$productIdentity]);
         $this->assertEquals([$productIdentity, $parentProductIdentity], $productIdentities);
     }
 }