Skip to content

Commit c158502

Browse files
authored
ENGCOM-4658: setAttributeSetFilter accepts both integer and integer-array #22133
2 parents 21e2680 + 9ac9737 commit c158502

File tree

1 file changed

+4
-3
lines changed
  • app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute

1 file changed

+4
-3
lines changed

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Eav\Model\ResourceModel\Entity\Attribute;
78

89
use Magento\Eav\Model\Entity\Type;
@@ -128,7 +129,7 @@ public function setEntityTypeFilter($type)
128129
/**
129130
* Specify attribute set filter
130131
*
131-
* @param int $setId
132+
* @param int|int[] $setId
132133
* @return $this
133134
*/
134135
public function setAttributeSetFilter($setId)
@@ -183,6 +184,7 @@ public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCod
183184

184185
/**
185186
* Specify multiple attribute sets filter
187+
*
186188
* Result will be ordered by sort_order
187189
*
188190
* @param array $setIds
@@ -225,7 +227,6 @@ public function setInAllAttributeSetsFilter(array $setIds)
225227
->having(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds));
226228
}
227229

228-
//$this->getSelect()->distinct(true);
229230
$this->setOrder('is_user_defined', self::SORT_ORDER_ASC);
230231

231232
return $this;
@@ -475,7 +476,7 @@ public function addStoreLabel($storeId)
475476
}
476477

477478
/**
478-
* {@inheritdoc}
479+
* @inheritdoc
479480
*/
480481
public function getSelectCountSql()
481482
{

0 commit comments

Comments
 (0)