Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade

# Conflicts:
#	composer.json
#	composer.lock

Author: Joan He

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -39,6 +39,6 @@ public function execute()
                 $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+        $this->_redirect('adminhtml/*/');
     }
 }

app/code/Magento/Catalog/Block/Product/Image.php

@@ -20,16 +20,19 @@
 class Image extends \Magento\Framework\View\Element\Template
 {
     /**
+     * @deprecated Property isn't used
      * @var \Magento\Catalog\Helper\Image
      */
     protected $imageHelper;
 
     /**
+     * @deprecated Property isn't used
      * @var \Magento\Catalog\Model\Product
      */
     protected $product;
 
     /**
+     * @deprecated Property isn't used
      * @var array
      */
     protected $attributes = [];

app/code/Magento/Catalog/Helper/Product/Configuration.php

@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Helper\Product;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface;
 use Magento\Framework\App\Helper\AbstractHelper;
@@ -43,6 +44,11 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      */
     private $serializer;
 
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
@@ -55,12 +61,14 @@ public function __construct(
         \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
         \Magento\Framework\Filter\FilterManager $filter,
         \Magento\Framework\Stdlib\StringUtils $string,
-        Json $serializer = null
+        Json $serializer = null,
+        Escaper $escaper = null
     ) {
         $this->_productOptionFactory = $productOptionFactory;
         $this->filter = $filter;
         $this->string = $string;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
         parent::__construct($context);
     }
 
@@ -175,7 +183,7 @@ public function getFormattedOptionValue($optionValue, $params = null)
             if (isset($optionValue['option_id'])) {
                 $optionInfo = $optionValue;
                 if (isset($optionInfo['value'])) {
-                    $optionValue = $optionInfo['value'];
+                    $optionValue = $this->escaper->escapeHtml($optionInfo['value']);
                 }
             } elseif (isset($optionValue['value'])) {
                 $optionValue = $optionValue['value'];

app/code/Magento/Catalog/view/base/templates/product/price/default.phtml

@@ -11,8 +11,6 @@
 <?php
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 
-$productId = $block->getSaleableItem()->getId();
-
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
 $priceModel = $block->getPriceType('regular_price');

app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml

@@ -11,8 +11,6 @@
 <?php
 /** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
 
-$productId = $block->getSaleableItem()->getId();
-
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
 $priceModel = $block->getPriceType('regular_price');

app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

@@ -130,7 +130,7 @@
                 </block>
             </container>
             <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
-                <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
+                <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" as="description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
                     <arguments>
                         <argument name="at_call" xsi:type="string">getDescription</argument>
                         <argument name="at_code" xsi:type="string">description</argument>

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -97,7 +97,11 @@ define([
                 success: function (res) {
                     var eventData, parameters;
 
-                    $(document).trigger('ajax:addToCart', form.data().productSku, form, res);
+                    $(document).trigger('ajax:addToCart', {
+                        'sku': form.data().productSku,
+                        'form': form,
+                        'response': res
+                    });
 
                     if (self.isLoaderEnabled()) {
                         $('body').trigger(self.options.processStop);

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -45,7 +45,7 @@
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
                             <!-- ko ifnot: Array.isArray(option.value) -->
-                                <span data-bind="html: option.value"></span>
+                                <span data-bind="text: option.value"></span>
                             <!-- /ko -->
                         </dd>
                         <!-- /ko -->

app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html

@@ -35,7 +35,7 @@
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
                     <!-- ko ifnot: ($data.full_view)-->
-                    <dd class="values" data-bind="html: value"></dd>
+                    <dd class="values" data-bind="text: value"></dd>
                     <!-- /ko -->
                 <!-- /ko -->
             </dl>

app/code/Magento/Config/Model/ResourceModel/Config.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Config\Model\ResourceModel;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * Core Resource Resource Model
  *
@@ -34,7 +36,7 @@ protected function _construct()
      * @param int $scopeId
      * @return $this
      */
-    public function saveConfig($path, $value, $scope, $scopeId)
+    public function saveConfig($path, $value, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
         $connection = $this->getConnection();
         $select = $connection->select()->from(
@@ -70,7 +72,7 @@ public function saveConfig($path, $value, $scope, $scopeId)
      * @param int $scopeId
      * @return $this
      */
-    public function deleteConfig($path, $scope, $scopeId)
+    public function deleteConfig($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeId = 0)
     {
         $connection = $this->getConnection();
         $connection->delete(