From 16b1bf115a186901bc4f17ab7f5593fb3a0079f2 Mon Sep 17 00:00:00 2001
From: Rafael Kassner <kassner@gmail.com>
Date: Wed, 3 Feb 2021 09:41:50 +0100
Subject: [PATCH 1/2] Make method signature consistent with interface

---
 app/code/Magento/Eav/Model/AttributeManagement.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index 31f962db3ee53..3434128e4d26d 100644
--- a/app/code/Magento/Eav/Model/AttributeManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -173,11 +173,11 @@ public function unassign($attributeSetId, $attributeCode)
     /**
      * {@inheritdoc}
      */
-    public function getAttributes($entityType, $attributeSetId)
+    public function getAttributes($entityTypeCode, $attributeSetId)
     {
         /** @var \Magento\Eav\Api\Data\AttributeSetInterface $attributeSet */
         $attributeSet = $this->setRepository->get($attributeSetId);
-        $requiredEntityTypeId = $this->eavConfig->getEntityType($entityType)->getId();
+        $requiredEntityTypeId = $this->eavConfig->getEntityType($entityTypeCode)->getId();
         if (!$attributeSet->getAttributeSetId() || $attributeSet->getEntityTypeId() != $requiredEntityTypeId) {
             throw NoSuchEntityException::singleField('attributeSetId', $attributeSetId);
         }

From 7f98263174698e90f138607a769aa3b7ef1ee8b0 Mon Sep 17 00:00:00 2001
From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com>
Date: Tue, 1 Oct 2024 15:08:44 +0530
Subject: [PATCH 2/2] 31955: Fix PHPCS error related to inherit doc tag

---
 app/code/Magento/Eav/Model/AttributeManagement.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index 3434128e4d26d..d298c4df70e39 100644
--- a/app/code/Magento/Eav/Model/AttributeManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -92,7 +92,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $attributeCode, $sortOrder)
     {
@@ -134,7 +134,7 @@ public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $att
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function unassign($attributeSetId, $attributeCode)
     {
@@ -171,7 +171,7 @@ public function unassign($attributeSetId, $attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAttributes($entityTypeCode, $attributeSetId)
     {