Merge branch 'ACP2E-3688' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-04-03-2025

Author: chittima

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

@@ -400,7 +400,11 @@ protected function _saveOption(AbstractModel $object)
         }
 
         if ($object->getDefaultValue()) {
-            $defaultValue = array_unique(array_merge($defaultValue, explode(",", $object->getDefaultValue())));
+            $frontendInput = $object->getFrontendInput();
+            if ($frontendInput === 'multiselect') {
+                $defaultValue =
+                    array_unique(array_merge($defaultValue, explode(",", $object->getDefaultValue())));
+            }
         }
 
         $this->_saveDefaultValue($object, $defaultValue);

app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php

@@ -1,13 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2012 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Eav\Test\Unit\Model\ResourceModel\Entity;
 
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Attribute\Source\Layout;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\Source\Table;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute;
@@ -99,15 +100,13 @@ public function testSaveOptionSystemAttribute()
         )->method(
             'fetchRow'
         )->willReturnMap(
-
+            [
                 [
-                    [
-                        'SELECT `eav_attribute`.* FROM `eav_attribute` ' .
-                        'WHERE (attribute_code="status") AND (entity_type_id="4")',
-                        $attributeData,
-                    ],
-                ]
-
+                    'SELECT `eav_attribute`.* FROM `eav_attribute` ' .
+                    'WHERE (attribute_code="status") AND (entity_type_id="4")',
+                    $attributeData,
+                ],
+            ]
         );
         $connectionMock->expects(
             $this->once()
@@ -123,6 +122,76 @@ public function testSaveOptionSystemAttribute()
         $resourceModel->save($model);
     }
 
+    /**
+     * Verify select option with multiple choice save one default value
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testSaveSelectDefaultOptionAttribute()
+    {
+        list($connectionMock, $resourceModel) = $this->_prepareResourceModel();
+
+        $originalData = [
+            'entity_type_id' => 4,
+            'attribute_code' => 'custom_layout',
+            'backend_model' => null,
+            'backend_type' => 'varchar',
+            'frontend_input' => 'select',
+            'frontend_label' => 'Test Dropdown',
+            'frontend_class' => null,
+            'source_model' => Layout::class,
+            'is_required' => 0,
+            'is_user_defined' => 1,
+            'is_unique' => 0,
+            'default_value' => "option_3",
+        ];
+
+        $attributeData = [
+            'id' => '999',
+            'attribute_id' => '123',
+            'entity_type_id' => 4,
+            'attribute_code' => 'custom_layout',
+            'backend_model' => null,
+            'backend_type' => 'varchar',
+            'frontend_input' => 'select',
+            'frontend_label' => 'Test Dropdown',
+            'frontend_class' => null,
+            'source_model' => Layout::class,
+            'is_required' => 0,
+            'is_user_defined' => 1,
+            'is_unique' => 0,
+            'default_value' => "option_3",
+            'default' => ['option_1'],
+            'sort_order' => 1,
+        ];
+
+        $objectManagerHelper = new ObjectManager($this);
+        /** @var AbstractModel $model */
+        $arguments = $objectManagerHelper->getConstructArguments(AbstractModel::class);
+        $arguments['data'] = $attributeData;
+        $arguments['context'] = $this->contextMock;
+        $model = $this->getMockBuilder(AbstractModel::class)
+            ->onlyMethods(['save'])
+            ->setConstructorArgs($arguments)
+            ->getMock();
+        $model->setOption(
+            [
+                'delete' =>
+                    [
+                        'option_1' => ['choice_1', 'Frontend choice_1'],
+                        'option_2' => ['choice_2', 'Frontend choice_2'],
+                        'option_3' => ['choice_3', 'Frontend choice_3']
+                    ]
+            ]
+        );
+
+        $connectionMock->expects($this->any())
+            ->method('update')
+            ->with('eav_attribute', $this->logicalOr($originalData, ['default_value' => "option_1"]));
+
+        $resourceModel->save($model);
+    }
+
     /**
      * @covers \Magento\Eav\Model\ResourceModel\Entity\Attribute::_saveOption
      */
@@ -171,24 +240,22 @@ public function testSaveOptionNewUserDefinedAttribute()
         )->method(
             'update'
         )->willReturnMap(
-
-                [['eav_attribute', ['default_value' => ''], ['attribute_id = ?' => 123], 1]]
-
+            [
+                ['eav_attribute', ['default_value' => ''], ['attribute_id = ?' => 123], 1]
+            ]
         );
         $connectionMock->expects(
             $this->once()
         )->method(
             'fetchRow'
         )->willReturnMap(
-
+            [
                 [
-                    [
-                        'SELECT `eav_attribute`.* FROM `eav_attribute` ' .
-                        'WHERE (attribute_code="a_dropdown") AND (entity_type_id="4")',
-                        false,
-                    ],
-                ]
-
+                    'SELECT `eav_attribute`.* FROM `eav_attribute` ' .
+                    'WHERE (attribute_code="a_dropdown") AND (entity_type_id="4")',
+                    false,
+                ],
+            ]
         );
         $connectionMock->expects(
             $this->once()
@@ -202,22 +269,20 @@ public function testSaveOptionNewUserDefinedAttribute()
         )->method(
             'insert'
         )->willReturnMap(
-
+            [
+                ['eav_attribute', $attributeData, 1],
+                ['eav_attribute_option', ['attribute_id' => 123, 'sort_order' => 0], 1],
                 [
-                    ['eav_attribute', $attributeData, 1],
-                    ['eav_attribute_option', ['attribute_id' => 123, 'sort_order' => 0], 1],
-                    [
-                        'eav_attribute_option_value',
-                        ['option_id' => 123, 'store_id' => 0, 'value' => 'Backend Label'],
-                        1
-                    ],
-                    [
-                        'eav_attribute_option_value',
-                        ['option_id' => 123, 'store_id' => 1, 'value' => 'Frontend Label'],
-                        1
-                    ],
-                ]
-
+                    'eav_attribute_option_value',
+                    ['option_id' => 123, 'store_id' => 0, 'value' => 'Backend Label'],
+                    1
+                ],
+                [
+                    'eav_attribute_option_value',
+                    ['option_id' => 123, 'store_id' => 1, 'value' => 'Frontend Label'],
+                    1
+                ],
+            ]
         );
         $connectionMock->expects($this->any())->method('getTransactionLevel')->willReturn(1);