Reverted changes not referred to an issue. Added backward compatibility and reverted initial version of unit tests because of backward compatibility (#24726)

Author: zhartaunik

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

@@ -158,8 +158,24 @@ public function __construct(
         $this->validatorPool = $validatorPool;
         $this->customOptionValuesFactory = $customOptionValuesFactory ?:
             \Magento\Framework\App\ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
-        $this->optionGroups = $optionGroups;
-        $this->optionGroupsToTypes = $optionGroupsToTypes;
+        $this->optionGroups = $optionGroups ?: [
+            'date' => 'Magento\Catalog\Model\Product\Option\Type\Date',
+            'file' => 'Magento\Catalog\Model\Product\Option\Type\File',
+            'select' => 'Magento\Catalog\Model\Product\Option\Type\Select',
+            'text' => 'Magento\Catalog\Model\Product\Option\Type\Text',
+        ];
+        $this->optionGroupsToTypes = $optionGroupsToTypes ?: [
+            'field' => 'text',
+            'area' => 'text',
+            'file' => 'file',
+            'drop_down' => 'select',
+            'radio' => 'select',
+            'checkbox' => 'select',
+            'multiple' => 'select',
+            'date' => 'date',
+            'date_time' => 'date',
+            'time' => 'date',
+        ];
 
         parent::__construct(
             $context,

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

@@ -24,16 +24,7 @@ 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,
-            [
-                'optionGroupsToTypes' => [
-                    'field' => 'text',
-                    'drop_down' => 'select',
-                    'file' => 'file',
-                ]
-            ]
-        );
+        $this->model = $objectManager->getObject(\Magento\Catalog\Model\Product\Option::class);
         $this->model->setProduct($this->productMock);
     }
 

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

@@ -72,6 +72,7 @@
     <preference for="Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface" type="Magento\Catalog\Model\Indexer\Product\Price\InvalidateIndex" />
     <preference for="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactoryInterface" type="Magento\Catalog\Model\Product\Gallery\ImagesConfigFactory" />
     <preference for="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverInterface" type="Magento\Catalog\Model\Product\Configuration\Item\ItemResolverComposite" />
+    <preference for="Magento\Catalog\Api\Data\MassActionInterface" type="\Magento\Catalog\Model\MassAction" />
     <type name="Magento\Customer\Model\ResourceModel\Visitor">
         <plugin name="catalogLog" type="Magento\Catalog\Model\Plugin\Log" />
     </type>