Renamed options and groups properties. PHPUnit changed Option object creation by adding option groups. (#24726)

Author: zhartaunik

app/code/Magento/Catalog/Model/Product/Option.php

@@ -11,9 +11,9 @@
 use Magento\Catalog\Api\Data\ProductCustomOptionValuesInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Option\Type\DefaultType;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection;
 use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractExtensibleModel;
@@ -100,14 +100,14 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
     protected $validatorPool;
 
     /**
-     * @var DefaultType[]
+     * @var string[]
      */
-    private $groupsPool;
+    private $optionGroups;
 
     /**
      * @var string[]
      */
-    private $typesPool;
+    private $optionGroupsToTypes;
 
     /**
      * @var MetadataPool
@@ -131,8 +131,8 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @param array $groupsPool
-     * @param array $typesPool
+     * @param array $optionGroups
+     * @param array $optionGroupsToTypes
      * @param ProductCustomOptionValuesInterfaceFactory|null $customOptionValuesFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -148,18 +148,18 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        array $groupsPool = [],
-        array $typesPool = [],
-        ProductCustomOptionValuesInterfaceFactory $customOptionValuesFactory = null
+        ProductCustomOptionValuesInterfaceFactory $customOptionValuesFactory = null,
+        array $optionGroups = [],
+        array $optionGroupsToTypes = []
     ) {
         $this->productOptionValue = $productOptionValue;
         $this->optionTypeFactory = $optionFactory;
         $this->string = $string;
         $this->validatorPool = $validatorPool;
-        $this->groupsPool = $groupsPool;
-        $this->typesPool = $typesPool;
         $this->customOptionValuesFactory = $customOptionValuesFactory ?:
             \Magento\Framework\App\ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
+        $this->optionGroups = $optionGroups;
+        $this->optionGroupsToTypes = $optionGroupsToTypes;
 
         parent::__construct(
             $context,
@@ -332,21 +332,21 @@ public function getGroupByType($type = null): string
             $type = $this->getType();
         }
 
-        return $this->typesPool[$type] ?? '';
+        return $this->optionGroupsToTypes[$type] ?? '';
     }
 
     /**
      * Group model factory
      *
      * @param string $type Option type
-     * @return DefaultType
+     * @return DataObject
      * @throws LocalizedException
      */
-    public function groupFactory($type): DefaultType
+    public function groupFactory($type)
     {
         $group = $this->getGroupByType($type);
-        if (!empty($group) && isset($this->groupsPool[$group])) {
-            return $this->optionTypeFactory->create($this->groupsPool[$group]);
+        if (!empty($group) && isset($this->optionGroups[$group])) {
+            return $this->optionTypeFactory->create($this->optionGroups[$group]);
         }
         throw new LocalizedException(__('The option type to get group instance is incorrect.'));
     }

app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php

@@ -24,7 +24,16 @@ protected function setUp()
     {
         $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $objectManager = new ObjectManager($this);
-        $this->model = $objectManager->getObject(\Magento\Catalog\Model\Product\Option::class);
+        $this->model = $objectManager->getObject(
+            \Magento\Catalog\Model\Product\Option::class,
+            [
+                'optionGroupsToTypes' => [
+                    'field' => 'text',
+                    'drop_down' => 'select',
+                    'file' => 'file',
+                ]
+            ]
+        );
         $this->model->setProduct($this->productMock);
     }
 

app/code/Magento/Catalog/etc/di.xml

@@ -412,13 +412,13 @@
     </type>
     <type name="Magento\Catalog\Model\Product\Option">
         <arguments>
-            <argument name="groupsPool" xsi:type="array">
+            <argument name="optionGroups" xsi:type="array">
                 <item name="date" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\Date</item>
                 <item name="file" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\File</item>
                 <item name="select" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\Select</item>
                 <item name="text" xsi:type="string">Magento\Catalog\Model\Product\Option\Type\Text</item>
             </argument>
-            <argument name="typesPool" xsi:type="array">
+            <argument name="optionGroupsToTypes" xsi:type="array">
                 <item name="field" xsi:type="string">text</item>
                 <item name="area" xsi:type="string">text</item>
                 <item name="file" xsi:type="string">file</item>