Skip to content

Commit f43fa82

Browse files
AC-1214 Fixed static test failure
1 parent 3b7285c commit f43fa82

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
2828
protected $_storeId;
2929

3030
/**
31-
* Store manager
31+
* Manager of store
3232
*
3333
* @var \Magento\Store\Model\StoreManagerInterface
3434
*/

app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ public function execute($entityType, $entityData, $arguments = [])
178178
$attributes = $connection->fetchAll($orderedUnionSelect);
179179
foreach ($attributes as $attributeValue) {
180180
if (isset($attributesMap[$attributeValue['attribute_id']])) {
181-
if (isset($attributeScopeGlobal[$attributeValue['attribute_id']]) && $attributeScopeGlobal[$attributeValue['attribute_id']]) {
181+
if (isset($attributeScopeGlobal[$attributeValue['attribute_id']]) &&
182+
$attributeScopeGlobal[$attributeValue['attribute_id']]
183+
) {
182184
if ((int)$attributeValue['store_id'] !== \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
183185
continue;
184186
}

app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,14 @@ public function testExecuteGlobalScope(
188188
->willReturn('linkField');
189189

190190
$attributeMock = $this->getMockBuilder(AbstractAttribute::class)
191-
->setMethods(['getAttributeCode', 'isScopeWebsite', 'getIsGlobal', 'isStatic', 'getBackend', 'getAttributeId'])
191+
->setMethods([
192+
'getAttributeCode',
193+
'isScopeWebsite',
194+
'getIsGlobal',
195+
'isStatic',
196+
'getBackend',
197+
'getAttributeId'
198+
])
192199
->disableOriginalConstructor()
193200
->getMockForAbstractClass();
194201
$attributeMock->method('isStatic')

0 commit comments

Comments
 (0)