Skip to content

Make method signature consistent with interface #31955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-devops-reposync-svc merged 7 commits into from
Aug 4, 2025
Merged

Make method signature consistent with interface #31955

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
16b1bf1
Make method signature consistent with interface
kassner Feb 3, 2021
1e9a36f
Merge branch '2.4-develop' into patch-29
engcom-Dash Sep 30, 2024
7f98263
31955: Fix PHPCS error related to inherit doc tag
engcom-Dash Oct 1, 2024
25b733b
Merge branch '2.4-develop' into patch-29
engcom-Dash Oct 3, 2024
b67eeca
Merge branch '2.4-develop' into patch-29
engcom-Dash Jul 21, 2025
5282d86
Fixed Static Test Failure
engcom-Dash Jul 21, 2025
0260883
Merge branch '2.4-develop' into patch-29
engcom-Dash Jul 30, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/code/Magento/Eav/Model/AttributeManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2014 Adobe
* All Rights Reserved.
*/

namespace Magento\Eav\Model;
Expand Down Expand Up @@ -92,7 +92,7 @@ public function __construct(
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $attributeCode, $sortOrder)
{
Expand Down Expand Up @@ -134,7 +134,7 @@ public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $att
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function unassign($attributeSetId, $attributeCode)
{
Expand Down Expand Up @@ -171,13 +171,13 @@ public function unassign($attributeSetId, $attributeCode)
}

/**
* {@inheritdoc}
* @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);
}
Expand Down