Skip to content
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

setAttributeSetFilter accepts both integer and integer-array #22133

Merged
merged 3 commits into from
Apr 20, 2019
Merged

setAttributeSetFilter accepts both integer and integer-array #22133

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c79c277
setAttributeSetFilter accepts both integer and integer-array
NiklasBr Apr 3, 2019
66ad38a
Merge branch '2.3-develop-mainline' into patch-1
p-bystritsky Apr 16, 2019
85319f0
magento/magento2#22133: Static test fix.
p-bystritsky Apr 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\Eav\Model\ResourceModel\Entity\Attribute;

use Magento\Eav\Model\Entity\Type;
Expand Down Expand Up @@ -128,7 +129,7 @@ public function setEntityTypeFilter($type)
/**
* Specify attribute set filter
*
* @param int $setId
* @param int|int[] $setId
* @return $this
*/
public function setAttributeSetFilter($setId)
Expand Down Expand Up @@ -183,6 +184,7 @@ public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCod

/**
* Specify multiple attribute sets filter
*
* Result will be ordered by sort_order
*
* @param array $setIds
Expand Down Expand Up @@ -225,7 +227,6 @@ public function setInAllAttributeSetsFilter(array $setIds)
->having(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds));
}

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

return $this;
Expand Down Expand Up @@ -475,7 +476,7 @@ public function addStoreLabel($storeId)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getSelectCountSql()
{
Expand Down