Skip to content

Commit e8356fb

Browse files
author
Mastiuhin Olexandr
committed
Merge branch 'MAGETWO-94306' into 2.3-develop-pr7
2 parents c62a81c + 4740c1a commit e8356fb

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ public function groupByAttribute($attribute)
653653
* @param string $bind attribute of the main entity to link with joined $filter
654654
* @param string $filter primary key for the joined entity (entity_id default)
655655
* @param string $joinType inner|left
656-
* @param null $storeId
656+
* @param int|null $storeId
657657
* @return $this
658658
* @throws LocalizedException
659659
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -947,8 +947,8 @@ public function load($printQuery = false, $logQuery = false)
947947
/**
948948
* Clone and reset collection
949949
*
950-
* @param null $limit
951-
* @param null $offset
950+
* @param int|null $limit
951+
* @param int|null $offset
952952
* @return Select
953953
*/
954954
protected function _getAllIdsSelect($limit = null, $offset = null)
@@ -1620,6 +1620,7 @@ public function getLoadedIds()
16201620

16211621
/**
16221622
* Clear collection
1623+
*
16231624
* @return $this
16241625
*/
16251626
public function clear()
@@ -1630,6 +1631,7 @@ public function clear()
16301631

16311632
/**
16321633
* Remove all items from collection
1634+
*
16331635
* @return $this
16341636
*/
16351637
public function removeAllItems()
@@ -1653,6 +1655,7 @@ public function removeItemByKey($key)
16531655
}
16541656

16551657
/**
1658+
* Returns main table.
16561659
* Returns main table name - extracted from "module/table" style and
16571660
* validated by db adapter
16581661
*

lib/internal/Magento/Framework/Data/Collection/AbstractDb.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
276276
}
277277

278278
/**
279-
* self::setOrder() alias
279+
* Sets order and direction.
280280
*
281281
* @param string $field
282282
* @param string $direction
@@ -365,6 +365,7 @@ protected function _renderFilters()
365365

366366
/**
367367
* Hook for operations before rendering filters
368+
*
368369
* @return void
369370
*/
370371
protected function _renderFiltersBefore()
@@ -602,6 +603,7 @@ protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
602603
}
603604

604605
/**
606+
* Returns an items collection.
605607
* Returns a collection item that corresponds to the fetched row
606608
* and moves the internal data pointer ahead
607609
*

0 commit comments

Comments
 (0)