CE#34569: CR improvements

Author: karyna-t

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

@@ -306,10 +306,7 @@ public function prepareOptionValueForRequest($optionValue)
         try {
             $value = $this->serializer->unserialize($infoBuyRequest->getValue());
 
-            if (is_array($value)
-                && isset($value['options'])
-                && isset($value['options'][$this->getOption()->getId()])
-            ) {
+            if (is_array($value) && isset($value['options'][$this->getOption()->getId()])) {
                 return $value['options'][$this->getOption()->getId()];
             } else {
                 return ['date_internal' => $optionValue];

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -2093,21 +2093,18 @@ protected function _parseCustomOptions($rowData)
             $optionValueParams = explode($this->_productEntity->getMultipleValueSeparator(), $optionValue);
             foreach ($optionValueParams as $nameAndValue) {
                 $nameAndValue = explode('=', $nameAndValue);
-                // @phpstan-ignore-next-line
-                if (!empty($nameAndValue)) {
-                    $value = isset($nameAndValue[1]) ? $nameAndValue[1] : '';
-                    $value = trim($value);
-                    $fieldName = trim($nameAndValue[0]);
-                    if ($value && ($fieldName == 'name')) {
-                        if ($name != $value) {
-                            $name = $value;
-                            $k = 0;
-                        }
-                    }
-                    if ($name) {
-                        $options[$name][$k][$fieldName] = $value;
+                $value = isset($nameAndValue[1]) ? $nameAndValue[1] : '';
+                $value = trim($value);
+                $fieldName = trim($nameAndValue[0]);
+                if ($value && ($fieldName === 'name')) {
+                    if ($name != $value) {
+                        $name = $value;
+                        $k = 0;
                     }
                 }
+                if ($name) {
+                    $options[$name][$k][$fieldName] = $value;
+                }
             }
             if (isset($rowData[Product::COL_STORE_VIEW_CODE])) {
                 $options[$name][$k][self::COLUMN_STORE] = $rowData[Product::COL_STORE_VIEW_CODE];