AC-15208: Attribute Option Label Gets Overwritten When Updating Store Labels

Updated code to preserve the standard style

Author: sumesh-GL

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

@@ -13,7 +13,7 @@
 use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Eav\Model\AttributeRepository;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option as AttributeOptionResource;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -35,24 +35,24 @@ class OptionManagement implements AttributeOptionManagementInterface, AttributeO
     protected $resourceModel;
 
     /**
-     * @var Attribute\Option
+     * @var AttributeOptionResource
      */
-    protected Attribute\Option $optionResource;
+    protected $optionResource;
 
     /**
      * @param AttributeRepository $attributeRepository
      * @param Attribute $resourceModel
-     * @param Option|null $optionResource
+     * @param AttributeOptionResource|null $optionResource
      * @codeCoverageIgnore
      */
     public function __construct(
         AttributeRepository $attributeRepository,
         Attribute $resourceModel,
-        ?Attribute\Option $optionResource = null
+        ?AttributeOptionResource $optionResource = null
     ) {
         $this->attributeRepository = $attributeRepository;
         $this->resourceModel = $resourceModel;
-        $this->optionResource = $optionResource ?: ObjectManager::getInstance()->get(Attribute\Option::class);
+        $this->optionResource = $optionResource ?: ObjectManager::getInstance()->get(AttributeOptionResource::class);
     }
 
     /**

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option.php

@@ -7,6 +7,8 @@
 
 /**
  * Entity attribute option resource model
+ *
+ * @author Magento Core Team <core@magentocommerce.com>
  */
 class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {

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

@@ -16,6 +16,7 @@
 use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface;
 use Magento\Eav\Model\Entity\Attribute\Source\Table as EavAttributeSource;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option as AttributeOptionResource;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
@@ -45,7 +46,7 @@ class OptionManagementTest extends TestCase
     protected $resourceModelMock;
 
     /**
-     * @var MockObject|Attribute\Option
+     * @var MockObject|AttributeOptionResource
      */
     protected $optionResourceMock;
 
@@ -56,7 +57,7 @@ protected function setUp(): void
     {
         $this->attributeRepositoryMock = $this->createMock(AttributeRepository::class);
         $this->resourceModelMock = $this->createMock(Attribute::class);
-        $this->optionResourceMock =  $this->createMock(Attribute\Option::class);
+        $this->optionResourceMock =  $this->createMock(AttributeOptionResource::class);
         $this->model = new OptionManagement(
             $this->attributeRepositoryMock,
             $this->resourceModelMock,