ACP2E-59: Importing Bundle with '?' in the option title corrupts how option is displayed and prevents product from being added to cart

Author: Chhandak.Barua

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml

@@ -7,7 +7,7 @@
 // phpcs:disable PHPCompatibility.Miscellaneous.RemovedAlternativePHPTags.MaybeASPOpenTagFound
 $_product = $block->getProduct();
 ?>
-<?php if ($_product->isSaleable() && $block->hasOptions()) :?>
+<?php if ($_product->isSaleable() && $block->hasOptions()): ?>
 <div id="bundleSummary"
      class="block-bundle-summary"
      data-mage-init='{"sticky":{"container": ".product-add-form"}}'>
@@ -19,11 +19,11 @@ $_product = $block->getProduct();
             <?= $block->getImage($_product, 'bundled_product_customization_page')->toHtml() ?>
             <div class="product-details">
                 <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
-                <?php if ($_product->getIsSalable()) :?>
+                <?php if ($_product->getIsSalable()): ?>
                     <p class="available stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
                         <span><?= $block->escapeHtml(__('In stock')) ?></span>
                     </p>
-                <?php else :?>
+                <?php else: ?>
                     <p class="unavailable stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
                         <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
                     </p>
@@ -58,7 +58,7 @@ $_product = $block->getProduct();
                 "slideBackSelector": ".action.customization.back",
                 "bundleProductSelector": "#bundleProduct",
                 "bundleOptionsContainer": ".product-add-form"
-                <?php if ($block->isStartCustomization()) :?>
+                <?php if ($block->isStartCustomization()): ?>
                 ,"autostart": true
                 <?php endif;?>
             }

dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php

@@ -184,6 +184,51 @@ public function testBundleImportUpdateValues(array $expectedValues): void
         $this->importedProductSkus = ['Simple 1', 'Simple 2', 'Simple 3', 'Bundle 1'];
     }
 
+    /**
+     * Test that Bundle options with question mark are updated correctly by import
+     *
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testBundleImportUpdateValuesWithQuestionMark(): void
+    {
+        // import data from CSV file
+        $pathToFile = __DIR__ . '/../../_files/import_bundle_with_question_mark.csv';
+        $errors = $this->doImport($pathToFile, Import::BEHAVIOR_APPEND);
+        $this->assertEquals(0, $errors->getErrorsCount());
+
+        // import data from CSV file to update values
+        $pathToFile2 = __DIR__ . '/../../_files/import_bundle_with_question_mark.csv';
+        $errors = $this->doImport($pathToFile2, Import::BEHAVIOR_APPEND);
+        $this->assertEquals(0, $errors->getErrorsCount());
+
+        $resource = $this->objectManager->get(ProductResource::class);
+        $productId = $resource->getIdBySku(self::TEST_PRODUCT_NAME);
+        $this->assertIsNumeric($productId);
+        /** @var Product $product */
+        $product = $this->objectManager->create(Product::class);
+        $product->load($productId);
+
+        $this->assertFalse($product->isObjectNew());
+        $this->assertEquals(self::TEST_PRODUCT_NAME, $product->getName());
+        $this->assertEquals(self::TEST_PRODUCT_TYPE, $product->getTypeId());
+        $this->assertEquals(1, $product->getShipmentType());
+
+        $optionIdList = $resource->getProductsIdsBySkus($this->optionSkuList);
+        $bundleOptionCollection = $product->getExtensionAttributes()->getBundleProductOptions();
+        $this->assertCount(1, $bundleOptionCollection);
+        foreach ($bundleOptionCollection as $optionKey => $option) {
+            $this->assertEquals('checkbox', $option->getData('type'));
+            $this->assertEquals('Option?', $option->getData('title'));
+            $this->assertEquals(self::TEST_PRODUCT_NAME, $option->getData('sku'));
+
+        }
+        $this->importedProductSkus = ['Simple 1', 'Bundle 1'];
+    }
+
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDbIsolation disabled

dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/_files/import_bundle_with_question_mark.csv

@@ -0,0 +1,3 @@
+sku,store_view_code,attribute_set_code,product_type,product_websites,name,product_online,price,additional_attributes,qty,out_of_stock_qty,website_id,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values
+Simple 1,,Default,simple,base,Simple 1,1,100,,1000,0,1,,,,,
+Bundle 1,,Default,bundle,base,Bundle 1,1,,shipment_type=separately,0,0,1,dynamic,dynamic,Price range,dynamic,"name=Option?,type=checkbox,required=1,sku=Simple 1,price=0.0000,default=0,default_qty=1.0000,price_type=fixed,can_change_qty=1"