🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #15146: [Backport] Fix typo in input type variable name (by @dmytro-ch)
 - #15138: [Backport] Add concrete type hints for product and category resources (by @rogyar)

Author: magento-engcom-team

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

@@ -114,6 +114,11 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_url;
 
+    /**
+     * @var ResourceModel\Category
+     */
+    protected $_resource;
+
     /**
      * URL rewrite model
      *
@@ -327,6 +332,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

@@ -117,6 +117,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $_urlModel = null;
 
+    /**
+     * @var ResourceModel\Product
+     */
+    protected $_resource;
+
     /**
      * @var string
      */
@@ -469,6 +474,18 @@ protected function _construct()
         $this->_init('Magento\Catalog\Model\ResourceModel\Product');
     }
 
+    /**
+     * 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();
+    }
+
     /**
      * {@inheritdoc}
      */

app/code/Magento/CatalogSearch/Block/Advanced/Form.php

@@ -197,16 +197,16 @@ public function getCurrency($attribute)
     public function getAttributeInputType($attribute)
     {
         $dataType = $attribute->getBackend()->getType();
-        $imputType = $attribute->getFrontend()->getInputType();
-        if ($imputType == 'select' || $imputType == 'multiselect') {
+        $inputType = $attribute->getFrontend()->getInputType();
+        if ($inputType == 'select' || $inputType == 'multiselect') {
             return 'select';
         }
 
-        if ($imputType == 'boolean') {
+        if ($inputType == 'boolean') {
             return 'yesno';
         }
 
-        if ($imputType == 'price') {
+        if ($inputType == 'price') {
             return 'price';
         }