🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #15136: [Backport] Add concrete type hints for product and category resources (by @rogyar)
 - #15129: Add missing false-check to the ConfiguredRegularPrice price-model (by @tkotosz)
 - #15173: Removed unused class declaration & code in comment (by @yogeshks)
 - #15162: Fixed js error when product has double quote in its name (by @vovayatsyuk)

Author: magento-engcom-team

app/code/Magento/Catalog/Model/Category.php

@@ -112,6 +112,11 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_url;
 
+    /**
+     * @var ResourceModel\Category
+     */
+    protected $_resource;
+
     /**
      * URL rewrite model
      *
@@ -332,6 +337,16 @@ protected function getCustomAttributesCodes()
         return $this->customAttributesCodes;
     }
 
+    /**
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Category
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
     /**
      * Get flat resource model flag
      *

app/code/Magento/Catalog/Model/Product.php

@@ -118,6 +118,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_urlModel = null;
 
+    /**
+     * @var ResourceModel\Product
+     */
+    protected $_resource;
+
     /**
      * @var string
      */
@@ -482,6 +487,18 @@ protected function _construct()
         $this->_init(\Magento\Catalog\Model\ResourceModel\Product::class);
     }
 
+    /**
+     * Get resource instance
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return \Magento\Catalog\Model\ResourceModel\Product
+     * @deprecated because resource models should be used directly
+     */
+    protected function _getResource()
+    {
+        return parent::_getResource();
+    }
+
     /**
      * Get a list of custom attribute codes that belongs to product attribute set. If attribute set not specified for
      * product will return all attribute codes

app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php

@@ -70,7 +70,8 @@ public function setItem(ItemInterface $item)
     public function getValue()
     {
         $basePrice = parent::getValue();
-        return $this->item
+
+        return ($this->item && $basePrice !== false)
             ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)
             : $basePrice;
     }

app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml

@@ -11,7 +11,7 @@ $viewModel = $block->getData('viewModel');
     "breadcrumbs": {
         "categoryUrlSuffix": "<?= $block->escapeHtml($viewModel->getCategoryUrlSuffix()); ?>",
         "useCategoryPathInUrl": <?= (int)$viewModel->isCategoryUsedInProductUrl(); ?>,
-        "product": "<?= $block->escapeHtml($viewModel->getProductName()); ?>"
+        "product": "<?= $block->escapeHtml($block->escapeJsQuote($viewModel->getProductName(), '"')); ?>"
     }
 }'>
 </div>

app/code/Magento/Review/view/frontend/templates/redirect.phtml

@@ -8,9 +8,6 @@
 
 ?>
 <?php
-/*    if(isset($GET['limit'])) {
-        $limit = $GET['limit']
-    }*/
     header("Location:{$block->getProduct()->getProductUrl()}#info-product_reviews");
     exit;
 ?>

app/code/Magento/Version/Controller/Index/Index.php

@@ -9,7 +9,6 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ProductMetadataInterface;
-use Magento\Framework\Exception\StateException;
 
 /**
  * Magento Version controller