From b16f63076538777fac13447734c9e9f86ed84f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B5nis=20Ormisson?= Date: Mon, 4 Feb 2019 14:06:55 +0200 Subject: [PATCH] fix arrayhelper to accept all yii components --- src/MyArrayHelper.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/MyArrayHelper.php b/src/MyArrayHelper.php index b2fa4f4..a90f984 100644 --- a/src/MyArrayHelper.php +++ b/src/MyArrayHelper.php @@ -3,6 +3,7 @@ use yii\base\Component; use yii\base\InvalidArgumentException; +use yii\base\Model; use yii\db\ActiveRecord; use yii\helpers\ArrayHelper; @@ -101,12 +102,13 @@ public static function indexByColumn($array, $colName) { if (!empty($array)) { $newArray = []; foreach ($array as $key => $row) { - if ($row instanceof ActiveRecord) { + if ($row instanceof Component) { + /** @var Model $row */ $rowArr = (array) $row->attributes; } else if (is_array($row)) { $rowArr = $row; } else { - throw new InvalidArgumentException('Only arrays or ActiveRecord Objects can be used in '.__CLASS__.'::'.__FUNCTION__); + throw new InvalidArgumentException('Only arrays or yii Component objects can be used in '.__CLASS__.'::'.__FUNCTION__); } // make it array if input is object