MAGETWO-28256: Bundle Integration API Refactoring

    - Fix build failures

Author: Yu Tang

app/code/Magento/Bundle/Api/Data/LinkInterface.php

@@ -22,7 +22,7 @@ public function getId();
     /**
      * Set id
      *
-     * @param $id
+     * @param string $id
      * @return $this
      */
     public function setId($id);

app/code/Magento/Bundle/Api/ProductLinkManagementInterface.php

@@ -12,7 +12,7 @@ interface ProductLinkManagementInterface
      * Get all children for Bundle product
      *
      * @param string $productSku
-     * @param int|null $optionId
+     * @param int $optionId
      * @return \Magento\Bundle\Api\Data\LinkInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException

app/code/Magento/Bundle/Model/Link.php

@@ -36,6 +36,9 @@ public function getId()
         return $this->getData(self::KEY_ID);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function setId($id)
     {
         return $this->setData(self::KEY_ID, $id);

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

@@ -84,7 +84,7 @@ public function getChildren($productSku, $optionId = null)
 
         $childrenList = [];
         foreach ($this->getOptions($product) as $option) {
-            if (!is_null($optionId) && $option->getOptionId() != $optionId) {
+            if ($optionId !== null && $option->getOptionId() != $optionId) {
                 continue;
             }
             /** @var \Magento\Catalog\Model\Product $selection */
@@ -147,7 +147,7 @@ public function saveChild(
         try {
             $selectionModel->save();
         } catch (\Exception $e) {
-            throw new CouldNotSaveException(__('Could not save child: "%1"', [$e->getMessage()], $e));
+            throw new CouldNotSaveException(__('Could not save child: "%1"', $e->getMessage()), $e);
         }
 
         return $selectionModel->getId();
@@ -168,25 +168,25 @@ protected function mapProductLinkToSelectionModel(
     ) {
         $selectionModel->setProductId($linkedProductId);
         $selectionModel->setParentProductId($parentProductId);
-        if (!is_null($productLink->getOptionId())) {
+        if (($productLink->getOptionId() !== null)) {
             $selectionModel->setOptionId($productLink->getOptionId());
         }
-        if (!is_null($productLink->getPosition())) {
+        if ($productLink->getPosition() !== null) {
             $selectionModel->setPosition($productLink->getPosition());
         }
-        if (!is_null($productLink->getQty())) {
+        if ($productLink->getQty() !== null) {
             $selectionModel->setSelectionQty($productLink->getQty());
         }
-        if (!is_null($productLink->getPriceType())) {
+        if ($productLink->getPriceType() !== null) {
             $selectionModel->setSelectionPriceType($productLink->getPriceType());
         }
-        if (!is_null($productLink->getPrice())) {
+        if ($productLink->getPrice() !== null) {
             $selectionModel->setSelectionPriceValue($productLink->getPrice());
         }
-        if (!is_null($productLink->getCanChangeQuantity())) {
+        if ($productLink->getCanChangeQuantity() !== null) {
             $selectionModel->setSelectionCanChangeQty($productLink->getCanChangeQuantity());
         }
-        if (!is_null($productLink->getIsDefault())) {
+        if ($productLink->getIsDefault() !== null) {
             $selectionModel->setIsDefault($productLink->getIsDefault());
         }
 

app/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php

@@ -21,6 +21,7 @@ class BundleSaveOptions
 
     /**
      * @param \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository
+     * @param \Magento\Catalog\Api\Data\ProductInterfaceFactory $productInterfaceFactory
      */
     public function __construct(
         \Magento\Bundle\Api\ProductOptionRepositoryInterface $optionRepository,

app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleLoadOptionsTest.php

@@ -81,6 +81,7 @@ public function testAroundLoad()
             ->willReturn([$optionMock]);
         $productExtensionMock = $this->getMockBuilder('\Magento\Catalog\Api\Data\ProductExtension')
             ->disableOriginalConstructor()
+            ->setMethods(['setBundleProductOptions', 'getBundleProductOptions'])
             ->getMock();
         $this->productExtensionFactory->expects($this->once())
             ->method('create')

app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleSaveOptionsTest.php

@@ -75,7 +75,7 @@ protected function setUp()
         );
         $this->productExtensionMock = $this->getMock(
             'Magento\Catalog\Api\Data\ProductExtension',
-            ['getBundleProductOptions'],
+            ['getBundleProductOptions', 'setBundleProductOptions'],
             [],
             '',
             false

dev/tests/unit/testsuite/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapperTest.php renamed to app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Catalog\Model\Plugin\ProductRepository;
+namespace Magento\Catalog\Test\Unit\Model\Plugin\ProductRepository;
 
 class TransactionWrapperTest extends \PHPUnit_Framework_TestCase
 {

dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductLinkManagementTest.php

@@ -159,6 +159,6 @@ protected function getChildren($productSku)
                 'operation' => self::SERVICE_NAME . 'getChildren',
             ],
         ];
-        return $this->_webApiCall($serviceInfo, ['productId' => $productSku]);
+        return $this->_webApiCall($serviceInfo, ['productSku' => $productSku]);
     }
 }

dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php

@@ -208,6 +208,9 @@ public function testUpdateBundleAddSelection()
         $bundleProductOptions[0]['product_links'][] = [
             'sku' => 'simple2',
             'qty' => 2,
+            "price" => 20,
+            "price_type" => 1,
+            "is_default" => false,
         ];
         $this->setBundleProductOptions($bundleProduct, $bundleProductOptions);
         $updatedProduct = $this->saveProduct($bundleProduct);
@@ -242,6 +245,9 @@ public function testUpdateBundleAddAndDeleteOption()
                 [
                     'sku' => 'simple2',
                     'qty' => 2,
+                    "price" => 20,
+                    "price_type" => 1,
+                    "is_default" => false,
                 ],
             ],
         ];
@@ -302,6 +308,9 @@ protected function createDynamicBundleProduct()
                     [
                         "sku" => 'simple',
                         "qty" => 1,
+                        "is_default" => true,
+                        "price" => 10,
+                        "price_type" => 1,
                     ],
                 ],
             ],
@@ -363,6 +372,7 @@ protected function createFixedPriceBundleProduct()
                         "qty" => 1,
                         "price" => 20,
                         "price_type" => 1,
+                        "is_default" => true,
                     ],
                 ],
             ],
@@ -479,10 +489,10 @@ protected function deleteProductBySku($productSku)
             'soap' => [
                 'service' => self::SERVICE_NAME,
                 'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_NAME . 'Save',
+                'operation' => self::SERVICE_NAME . 'deleteById',
             ],
         ];
-        $requestData = [];
+        $requestData = ["sku" => $productSku];
         $response = $this->_webApiCall($serviceInfo, $requestData);
         return $response;
     }