Merge pull request #138 from magento-fearless-kiwis/FearlessKiwis-MAGETWO-32905-Refactor-API-Framework

[FearlessKiwis] S42-B: Remove immutability requirement

Author: Tang, Yu(ytang1)

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

@@ -15,20 +15,20 @@ class BundleLoadOptions
     protected $productOptionList;
 
     /**
-     * @var \Magento\Framework\Api\AttributeDataBuilder
+     * @var \Magento\Framework\Api\AttributeValueFactory
      */
-    protected $customAttributeBuilder;
+    protected $customAttributeFactory;
 
     /**
      * @param \Magento\Bundle\Model\Product\OptionList $productOptionList
-     * @param \Magento\Framework\Api\AttributeDataBuilder $customAttributeBuilder
+     * @param \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
      */
     public function __construct(
         \Magento\Bundle\Model\Product\OptionList $productOptionList,
-        \Magento\Framework\Api\AttributeDataBuilder $customAttributeBuilder
+        \Magento\Framework\Api\AttributeValueFactory $customAttributeFactory
     ) {
         $this->productOptionList = $productOptionList;
-        $this->customAttributeBuilder = $customAttributeBuilder;
+        $this->customAttributeFactory = $customAttributeFactory;
     }
 
     /**
@@ -50,10 +50,9 @@ public function aroundLoad(
         if ($product->getTypeId() != \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
             return $product;
         }
-        $customAttribute = $this->customAttributeBuilder
+        $customAttribute = $this->customAttributeFactory->create()
             ->setAttributeCode('bundle_product_options')
-            ->setValue($this->productOptionList->getItems($product))
-            ->create();
+            ->setValue($this->productOptionList->getItems($product));
         $attributes = array_merge($product->getCustomAttributes(), ['bundle_product_options' => $customAttribute]);
         $product->setData('custom_attributes', $attributes);
         return $product;

app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php

@@ -69,6 +69,7 @@ protected function setUp()
         $this->productRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductRepositoryInterface');
         $this->typeMock = $this->getMock('\Magento\Bundle\Model\Product\Type', [], [], '', false);
         $this->optionFactoryMock = $this->getMockBuilder('\Magento\Bundle\Api\Data\OptionInterfaceFactory')
+            ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
         $this->dataObjectHelperMock = $this->getMockBuilder('\Magento\Framework\Api\DataObjectHelper')

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

@@ -21,15 +21,15 @@ class BundleLoadOptionsTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $attributeBuilderMock;
+    protected $attributeFactoryMock;
 
     protected function setUp()
     {
         $this->optionListMock = $this->getMock('\Magento\Bundle\Model\Product\OptionList', [], [], '', false);
-        $this->attributeBuilderMock = $this->getMock('\Magento\Framework\Api\AttributeDataBuilder', [], [], '', false);
+        $this->attributeFactoryMock = $this->getMock('\Magento\Framework\Api\AttributeValueFactory', [], [], '', false);
         $this->model = new \Magento\Bundle\Model\Plugin\BundleLoadOptions(
             $this->optionListMock,
-            $this->attributeBuilderMock
+            $this->attributeFactoryMock
         );
     }
 
@@ -69,16 +69,16 @@ public function testAroundLoad()
             ->method('getItems')
             ->with($productMock)
             ->willReturn([$optionMock]);
-        $this->attributeBuilderMock->expects($this->once())
+        $customAttributeMock = $this->getMock('\Magento\Framework\Api\AttributeValue', [], [], '', false);
+        $customAttributeMock->expects($this->once())
             ->method('setAttributeCode')
             ->with('bundle_product_options')
             ->willReturnSelf();
-        $this->attributeBuilderMock->expects($this->once())
+        $customAttributeMock->expects($this->once())
             ->method('setValue')
             ->with([$optionMock])
             ->willReturnSelf();
-        $customAttributeMock = $this->getMock('\Magento\Framework\Api\AttributeValue', [], [], '', false);
-        $this->attributeBuilderMock->expects($this->once())->method('create')->willReturn($customAttributeMock);
+        $this->attributeFactoryMock->expects($this->once())->method('create')->willReturn($customAttributeMock);
 
         $productAttributeMock = $this->getMock('\Magento\Framework\Api\AttributeValue', [], [], '', false);
         $productMock->expects($this->once())->method('getCustomAttributes')->willReturn([$productAttributeMock]);

app/code/Magento/Catalog/Api/Data/CategoryAttributeSearchResultsInterface.php

@@ -14,4 +14,12 @@ interface CategoryAttributeSearchResultsInterface extends \Magento\Framework\Api
      * @return \Magento\Catalog\Api\Data\CategoryAttributeInterface[]
      */
     public function getItems();
+
+    /**
+     * Set attributes list.
+     *
+     * @param \Magento\Catalog\Api\Data\CategoryAttributeInterface[] $items
+     * @return $this
+     */
+    public function setItems(array $items = null);
 }