From 4bc5c6f99b0eebc868e42e04afad3a922f67de27 Mon Sep 17 00:00:00 2001
From: Meher jeet <42374679+mjsachan-cedcoss@users.noreply.github.com>
Date: Sat, 29 Dec 2018 12:18:01 +0530
Subject: [PATCH 1/3] Update AbstractResource.php

---
 .../Magento/Catalog/Model/ResourceModel/AbstractResource.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index b9e629912a5b3..f7879d7f93281 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -485,7 +485,7 @@ protected function _canUpdateAttribute(AbstractAttribute $attribute, $value, arr
      * Retrieve attribute's raw value from DB.
      *
      * @param int $entityId
-     * @param int|string|array $attribute atrribute's ids or codes
+     * @param int|string|array $attribute attribute's ids or codes
      * @param int|\Magento\Store\Model\Store $store
      * @return bool|string|array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)

From b863602f3479613dc75e990c18ef8e5bf34ad553 Mon Sep 17 00:00:00 2001
From: Meher jeet <42374679+mjsachan-cedcoss@users.noreply.github.com>
Date: Sat, 29 Dec 2018 12:19:35 +0530
Subject: [PATCH 2/3] Update AdminCategoryActionGroup.xml

---
 .../Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
index 57f91b78fcbe9..84e8e43e83845 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
@@ -154,7 +154,7 @@
 
         <fillField stepKey="fillCategoryName" selector="{{AdminProductCategoryCreationSection.nameInput}}" userInput="{{categoryName}}"/>
 
-        <!-- Search and select a parent catagory for the product -->
+        <!-- Search and select a parent category for the product -->
         <click stepKey="clickParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategory}}"/>
         <waitForPageLoad stepKey="waitForDropDownVisible"/>
         <fillField stepKey="searchForParent" userInput="{{parentCategoryName}}" selector="{{AdminProductCategoryCreationSection.parentSearch}}"/>

From bf32a7f603af79d5ac7b0c487c887d907d169b38 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 11 Feb 2019 13:53:02 +0200
Subject: [PATCH 3/3] Fix static tests.

---
 .../Catalog/Model/ResourceModel/AbstractResource.php  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index f7879d7f93281..786fff611a025 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -7,6 +7,9 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 
 /**
  * Catalog entity abstract model
@@ -86,16 +89,14 @@ protected function _isApplicableAttribute($object, $attribute)
     /**
      * Check whether attribute instance (attribute, backend, frontend or source) has method and applicable
      *
-     * @param AbstractAttribute|\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
-     * |\Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend
-     * |\Magento\Eav\Model\Entity\Attribute\Source\AbstractSource $instance
+     * @param AbstractAttribute|AbstractBackend|AbstractFrontend|AbstractSource $instance
      * @param string $method
      * @param array $args array of arguments
      * @return boolean
      */
     protected function _isCallableAttributeInstance($instance, $method, $args)
     {
-        if ($instance instanceof \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
+        if ($instance instanceof AbstractBackend
             && ($method == 'beforeSave' || $method == 'afterSave')
         ) {
             $attributeCode = $instance->getAttribute()->getAttributeCode();
@@ -112,6 +113,7 @@ protected function _isCallableAttributeInstance($instance, $method, $args)
 
     /**
      * Retrieve select object for loading entity attributes values
+     *
      * Join attribute store value
      *
      * @param \Magento\Framework\DataObject $object
@@ -244,6 +246,7 @@ protected function _saveAttributeValue($object, $attribute, $value)
 
     /**
      * Check if attribute present for non default Store View.
+     *
      * Prevent "delete" query locking in a case when nothing to delete
      *
      * @param AbstractAttribute $attribute