ENGCOM-2793: [Forwardport] 6305 - Resolved product custom option title save issue #17607

Author: Stanislav Idolov

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

@@ -106,7 +106,9 @@ protected function isValidOptionTitle($title, $storeId)
         if ($storeId > \Magento\Store\Model\Store::DEFAULT_STORE_ID && $title === null) {
             return true;
         }
-        if ($this->isEmpty($title)) {
+
+        // checking whether title is null and is empty string
+        if ($title === null || $title === '') {
             return false;
         }
 

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

@@ -256,7 +256,8 @@ protected function _saveValueTitles(AbstractModel $object)
                 $object->unsetData('title');
             }
 
-            if ($object->getTitle()) {
+            /*** Checking whether title is not null ***/
+            if ($object->getTitle()!= null) {
                 if ($existInCurrentStore) {
                     if ($storeId == $object->getStoreId()) {
                         $where = [

app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php

@@ -127,7 +127,8 @@ public function draw()
                     'feed' => 35,
                 ];
 
-                if ($option['value']) {
+                // Checking whether option value is not null
+                if ($option['value']!= null) {
                     if (isset($option['print_value'])) {
                         $printValue = $option['print_value'];
                     } else {

app/code/Magento/Sales/Model/Order/Pdf/Items/Shipment/DefaultShipment.php

@@ -89,7 +89,7 @@ public function draw()
                 ];
 
                 // draw options value
-                if ($option['value']) {
+                if ($option['value']!= null) {
                     $printValue = isset(
                         $option['print_value']
                     ) ? $option['print_value'] : $this->filterManager->stripTags(

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionRepositoryTest.php

@@ -208,7 +208,7 @@ public function testAddNegative($optionData)
         ];
 
         if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            if (isset($optionDataPost['title']) && empty($optionDataPost['title'])) {
+            if ($optionDataPost['title'] === null || $optionDataPost['title'] === '') {
                 $this->expectException('SoapFault');
                 $this->expectExceptionMessage('Missed values for option required fields');
             } else {

dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php

@@ -6,7 +6,7 @@
 
 return [
     'empty_required_field' => [
-        'title' => '',
+        'title' => null,
         'type' => 'field',
         'sort_order' => 1,
         'is_require' => 1,
@@ -54,7 +54,7 @@
                 'price' => 10.0,
                 'price_type' => 'fixed',
                 'sku' => 'radio option 1 sku',
-                'title' => '',
+                'title' => null,
                 'sort_order' => 1,
             ],
         ],