Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3374' into Tier4-Kings-PR-11-22-2024

Author: devarul

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -423,6 +423,17 @@ public static function getAllOptionsDataProvider()
                     ['value' => '16', 'label' => 'black'],
                     ['value' => '17', 'label' => 'white']
                 ]
+            ],
+            [
+                true,
+                true,
+                [['value' => '16', 'label' => 'default sv black'], ['value' => '17', 'label' => 'default sv white']],
+                [['value' => '16', 'label' => 'black'], ['value' => '17', 'label' => 'white']],
+                [
+                    ['label' => ' ', 'value' => ''],
+                    ['value' => '16', 'label' => 'black'],
+                    ['value' => '17', 'label' => 'white']
+                ]
             ]
         ];
     }

app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Rule\Model\Condition\Product;
@@ -243,7 +243,7 @@ protected function _prepareValueOptions()
                 } else {
                     $addEmptyOption = true;
                 }
-                $selectOptions = $attributeObject->getSource()->getAllOptions($addEmptyOption);
+                $selectOptions = $attributeObject->getSource()->getAllOptions($addEmptyOption, true);
             }
         }
 

app/code/Magento/Rule/Test/Unit/Model/Condition/Product/AbstractProductTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -360,7 +360,7 @@ public function testPrepareValueOptions(
         $attrObjectSourceMock
             ->expects((null === $expectedAttrObjSourceAllOptionsParam) ? $this->never() : $this->once())
             ->method('getAllOptions')
-            ->with($expectedAttrObjSourceAllOptionsParam)
+            ->with($expectedAttrObjSourceAllOptionsParam, true)
             ->willReturn($attrObjectSourceAllOptionsValue);
 
         $attributeObjectMock = $this->getMockBuilder(Attribute::class)