Skip to content

Commit 667cb34

Browse files
Merge remote-tracking branch '39155/bad-phpdoc-attribute-collection' into comprs_jul2
2 parents 15560d7 + 88f05c1 commit 667cb34

File tree

1 file changed

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

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
* EAV attribute resource collection
2323
*
2424
* @api
25-
* @author Magento Core Team <core@magentocommerce.com>
2625
* @since 100.0.2
2726
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2827
*/
@@ -502,14 +501,15 @@ public function getSelectCountSql()
502501
/**
503502
* Join table to collection select
504503
*
505-
* @param string $table
506-
* @param string $cond
507-
* @param string $cols
504+
* @param string|array $table Table name or alias => table
505+
* @param string $cond Join condition
506+
* @param string|array<string> $cols Columns to select
508507
* @return $this
509508
* @since 100.1.0
510509
*/
511510
public function joinLeft($table, $cond, $cols = '*')
512511
{
512+
$alias = null; // prevent undefined variable notice
513513
if (is_array($table)) {
514514
foreach ($table as $k => $v) {
515515
$alias = $k;

0 commit comments

Comments
 (0)