#12920: Fixed review issues

Author: Stanislav Idolov

app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php

@@ -29,7 +29,7 @@ public function getItems($attributeCode);
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return \Magento\Eav\Api\Data\AttributeOptionInterface
+     * @return string
      */
     public function add($attributeCode, $option);
 

app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php

@@ -20,7 +20,7 @@ interface AttributeOptionManagementInterface
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
-     * @return \Magento\Eav\Api\Data\AttributeOptionInterface
+     * @return string
      */
     public function add($entityType, $attributeCode, $option);
 

app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php

@@ -75,7 +75,7 @@ public function add($entityType, $attributeCode, $option)
             throw new StateException(__('The "%1" attribute can\'t be saved.', $attributeCode));
         }
 
-        return $option;
+        return $this->getOptionId($option);
     }
 
     /**
@@ -151,7 +151,7 @@ protected function validateOption($attribute, $optionId)
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @return string
      */
-    private function getOptionId($option)
+    private function getOptionId(\Magento\Eav\Api\Data\AttributeOptionInterface $option) : string
     {
         return $option->getValue() ?: 'new_option';
     }
@@ -162,8 +162,11 @@ private function getOptionId($option)
      * @param string $optionLabel
      * @return void
      */
-    protected function setOptionValue($option, $attribute, $optionLabel)
-    {
+    private function setOptionValue(
+        \Magento\Eav\Api\Data\AttributeOptionInterface $option,
+        \Magento\Eav\Api\Data\AttributeInterface $attribute,
+        string $optionLabel
+    ) {
         $optionId = $attribute->getSource()->getOptionId($optionLabel);
         if ($optionId) {
             $option->setValue($attribute->getSource()->getOptionId($optionId));

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php

@@ -81,7 +81,7 @@ public function testAdd()
         $attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->assertEquals($optionMock, $this->model->add($entityType, $attributeCode, $optionMock));
+        $this->assertEquals('new_option', $this->model->add($entityType, $attributeCode, $optionMock));
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php

@@ -74,7 +74,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
+        $this->assertNotNull($response);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php

@@ -42,7 +42,7 @@ public function testAdd($optionData)
             ]
         );
 
-        $this->assertNotNull($response[AttributeOptionInterface::VALUE]);
+        $this->assertNotNull($response);
         $updatedData = $this->getAttributeOptions($testAttributeCode);
         $lastOption = array_pop($updatedData);
         $this->assertEquals(