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>
@@ -48,7 +48,6 @@ $_product = $block->getProduct();
         </div>
     </div>
 </div>
-    <?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate?>
 <script type="text/x-magento-init">
     {
         ".product-add-form": {
@@ -58,7 +57,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;?>
             }

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -184,7 +184,6 @@ protected function parseSelections($rowData, $entityId)
         $selections = explode(
             Product::PSEUDO_MULTI_LINE_SEPARATOR,
             $rowData['bundle_values']
-            //str_replace('?', '?', $rowData['bundle_values'])
         );
         foreach ($selections as $selection) {
             $values = explode($this->_entityModel->getMultipleValueSeparator(), $selection);
@@ -200,7 +199,7 @@ protected function parseSelections($rowData, $entityId)
                     $this->_cachedOptions[$entityId][$option['name']]['selections'] = [];
                 }
                 $this->_cachedOptions[$entityId][$option['name']]['selections'][] = $option;
-                $this->_cachedOptionSelectQuery[] = 'parent_id =' . (int)$entityId . ' AND title =' . $option['name'];
+                $this->_cachedOptionSelectQuery[] = [(int)$entityId, $option['name']];
             }
         }
         return $selections;
@@ -481,11 +480,10 @@ protected function populateExistingOptions()
         );
         $orWhere = false;
         foreach ($this->_cachedOptionSelectQuery as $item) {
-            $expItem = explode('=', $item);
             if ($orWhere) {
-                $select->orWhere($expItem[0].' = '.$expItem[1].' = ?', $expItem[2]);
+                $select->orWhere('parent_id = '.$item[0].' AND title = ?', $item[1]);
             } else {
-                $select->where($expItem[0].' = '.$expItem[1].' = ?', $expItem[2]);
+                $select->where('parent_id = '.$item[0].' AND title = ?', $item[1]);
                 $orWhere = true;
             }
         }