Merge remote-tracking branch 'origin/imported-magento-magento2-31066' into 2.4-develop-pr113

Author: zakdma

app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml

@@ -6,18 +6,23 @@
 
 // phpcs:disable Magento2.Files.LineLength
 ?>
-<strong class="product name product-item-name"><a href="<?= $block->escapeUrl($block->getProductUrl()) ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
+<?php
+/** @var \Magento\Checkout\Block\Cart\Item\Renderer\ $block */
+/** @var \Magento\Framework\Escaper $escaper */
+?>
+
+<strong class="product name product-item-name"><a href="<?= $escaper->escapeUrl($block->getProductUrl()) ?>"><?= $escaper->escapeHtml($block->getProductName()) ?></a></strong>
 <?php if ($_options = $block->getOptionList()) : ?>
     <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+            <dt><?= $escaper->escapeHtml($_option['label']) ?></dt>
             <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
-                <?= $block->escapeHtml($_formatedOptionValue['value'], ['span']) ?>
+                <?= $escaper->escapeHtml($_formatedOptionValue['value'], ['span', 'a']) ?>
                 <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                     <dl class="item options tooltip content">
-                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                        <dd><?= $block->escapeHtml($_formatedOptionValue['full_view'], ['span']) ?></dd>
+                        <dt><?= $escaper->escapeHtml($_option['label']) ?></dt>
+                        <dd><?= $escaper->escapeHtml($_formatedOptionValue['full_view'], ['span']) ?></dd>
                     </dl>
                 <?php endif; ?>
             </dd>

dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/OverviewTest.php

@@ -6,28 +6,58 @@
 
 namespace Magento\Multishipping\Block\Checkout;
 
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Checkout\Block\Cart\Item\Renderer;
+use Magento\Framework\App\Area;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\Element\RendererList;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Xpath;
+use PHPUnit\Framework\TestCase;
+
 /**
- * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * Verify default items template
  */
-class OverviewTest extends \PHPUnit\Framework\TestCase
+class OverviewTest extends TestCase
 {
     /**
-     * @var \Magento\Multishipping\Block\Checkout\Overview
+     * @var Overview
+     */
+    private $block;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var ProductRepository
      */
-    protected $_block;
+    private $product;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var Item
      */
-    protected $_objectManager;
+    private $item;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->_block = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class)
+        Bootstrap::getInstance()->loadArea(Area::AREA_FRONTEND);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->block = $this->objectManager->get(LayoutInterface::class)
             ->createBlock(
-                \Magento\Multishipping\Block\Checkout\Overview::class,
+                Overview::class,
                 'checkout_overview',
                 [
                     'data' => [
@@ -37,33 +67,49 @@ protected function setUp(): void
                 ]
             );
 
-        $this->_block->addChild('renderer.list', \Magento\Framework\View\Element\RendererList::class);
-        $this->_block->getChildBlock(
+        $this->block->addChild('renderer.list', RendererList::class);
+        $this->block->getChildBlock(
             'renderer.list'
         )->addChild(
             'default',
-            \Magento\Checkout\Block\Cart\Item\Renderer::class,
+            Renderer::class,
             ['template' => 'cart/item/default.phtml']
         );
+        $this->quote = $this->objectManager->create(Quote::class);
+        $this->product = $this->objectManager->create(ProductRepository::class);
+        $this->item = $this->objectManager->create(Item::class);
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
     public function testGetRowItemHtml()
     {
-        /** @var $item \Magento\Quote\Model\Quote\Item */
-        $item = $this->_objectManager->create(\Magento\Quote\Model\Quote\Item::class);
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = $this->_objectManager->create(\Magento\Catalog\Model\Product::class);
-        $product->load(1);
-        $item->setProduct($product);
-        /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->_objectManager->create(\Magento\Quote\Model\Quote::class);
-        $item->setQuote($quote);
+        $product = $this->product->get('simple');
+        $item = $this->item->setProduct($product);
+        $item->setQuote($this->quote);
         // assure that default renderer was obtained
         $this->assertEquals(
             1,
-            \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+            Xpath::getElementsCountForXpath(
                 '//*[contains(@class,"product") and contains(@class,"name")]/a',
-                $this->_block->getRowItemHtml($item)
+                $this->block->getRowItemHtml($item)
+            )
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/customer_quote_with_items_simple_product_options.php
+     */
+    public function testLinkOptionalProductFileItemHtml()
+    {
+        $quote = $this->quote->load('customer_quote_product_custom_options', 'reserved_order_id');
+        $item = current($quote->getAllItems());
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath(
+                '//dd/a[contains(text(), "test.jpg")]',
+                $this->block->getRowItemHtml($item)
             )
         );
     }