MAGETWO-56947: [API] Can not link simple product to configurable one - mainline

Author: RuslanKostiv1

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

@@ -22,6 +22,7 @@
  * @method Product setHasError(bool $value)
  * @method \Magento\Catalog\Model\ResourceModel\Product getResource()
  * @method null|bool getHasError()
+ * @method Product setAssociatedProductIds(array $productIds)
  * @method array getAssociatedProductIds()
  * @method Product setNewVariationsAttributeSetId(int $value)
  * @method int getNewVariationsAttributeSetId()
@@ -1908,12 +1909,10 @@ public function addOption(Product\Option $option)
      */
     public function getOptionById($optionId)
     {
-        if (is_array($this->getOptions())) {
-            /** @var \Magento\Catalog\Model\Product\Option $option */
-            foreach ($this->getOptions() as $option) {
-                if ($option->getId() == $optionId) {
-                    return $option;
-                }
+        /** @var \Magento\Catalog\Model\Product\Option $option */
+        foreach ($this->getOptions() as $option) {
+            if ($option->getId() == $optionId) {
+                return $option;
             }
         }
 
@@ -2273,7 +2272,7 @@ public function getIdentities()
                 $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
             }
         }
-        
+
         if (($this->getOrigData('status') != $this->getData('status')) || $this->isStockStatusChanged()) {
             foreach ($this->getCategoryIds() as $categoryId) {
                 $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
@@ -2288,7 +2287,7 @@ public function getIdentities()
 
     /**
      * Check whether stock status changed
-     * 
+     *
      * @return bool
      */
     private function isStockStatusChanged()
@@ -2306,7 +2305,7 @@ private function isStockStatusChanged()
             && ($stockItem->getIsInStock() != $stockData['is_in_stock'])
         );
     }
-    
+
     /**
      * Reload PriceInfo object
      *
@@ -2613,14 +2612,4 @@ private function getMediaGalleryProcessor()
         }
         return $this->mediaGalleryProcessor;
     }
-
-    /**
-     * Set the associated products
-     * @param array $productIds
-     * @return void
-     */
-    public function setAssociatedProductIds(array $productIds)
-    {
-        $this->getExtensionAttributes()->setConfigurableProductLinks($productIds);
-    }
 }

app/code/Magento/ConfigurableProduct/Model/LinkManagement.php

@@ -103,7 +103,7 @@ public function addChild($sku, $childSku)
         }
 
         $childrenIds[] = $child->getId();
-        $product->setAssociatedProductIds($childrenIds);
+        $product->getExtensionAttributes()->setConfigurableProductLinks($childrenIds);
         $product->save();
         return true;
     }
@@ -132,7 +132,7 @@ public function removeChild($sku, $childSku)
         if (count($options) == count($ids)) {
             throw new NoSuchEntityException(__('Requested option doesn\'t exist'));
         }
-        $product->setAssociatedProductIds($ids);
+        $product->getExtensionAttributes()->setConfigurableProductLinks($ids);
         $product->save();
         return true;
     }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php

@@ -7,6 +7,7 @@
 namespace Magento\ConfigurableProduct\Test\Unit\Model;
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Test\Unit\Model\Product\ProductExtensionAttributes;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -162,6 +163,15 @@ public function testAddChild()
             ->will(
                 $this->returnValue([0 => [1, 2, 3]])
             );
+
+        $extensionAttributes = $this->getMockBuilder(ProductExtensionAttributes::class)
+            ->setMethods(['setConfigurableProductLinks'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $configurable->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+        $extensionAttributes->expects($this->once())->method('setConfigurableProductLinks')->willReturnSelf();
+
         $configurable->expects($this->once())->method('save');
 
         $this->assertTrue(true, $this->object->addChild($productSku, $childSku));
@@ -233,12 +243,14 @@ public function testRemoveChild()
         $productType->expects($this->once())->method('getUsedProducts')
             ->will($this->returnValue([$option]));
 
-        $extensionAttributesMock = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
-            ->disableOriginalConstructor()
+        $extensionAttributes = $this->getMockBuilder(ProductExtensionAttributes::class)
             ->setMethods(['setConfigurableProductLinks'])
-            ->getMock();
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $product->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+        $extensionAttributes->expects($this->once())->method('setConfigurableProductLinks')->willReturnSelf();
 
-        $product->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttributesMock);
         $product->expects($this->once())->method('save');
         $this->assertTrue($this->object->removeChild($productSku, $childSku));
     }