fix arrayhelper to accept all yii components

TonisOrmisson · Feb 4, 2019 · b16f630 · b16f630
1 parent c405e71
commit b16f630
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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