Rename ArArrayHelper::populate() to ArArrayHelper::index()

yiisoft · May 25, 2024 · 1bae31f · 1bae31f
1 parent 4d6bcaf
commit 1bae31f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/ActiveQuery.php b/src/ActiveQuery.php
@@ -275,7 +275,7 @@ public function populate(array $rows, Closure|string|null $indexBy = null): arra
             $this->addInverseRelations($models);
         }
 
-        return ArArrayHelper::populate($models, $indexBy);
+        return ArArrayHelper::index($models, $indexBy);
     }
 
     /**

diff --git a/src/ArArrayHelper.php b/src/ArArrayHelper.php
@@ -96,8 +96,7 @@ public static function getValueByPath(ActiveRecordInterface|array $array, string
             }
 
             if (property_exists($array, $key)) {
-                $values = get_object_vars($array);
-                return array_key_exists($key, $values) ? $values[$key] : $default;
+                return array_key_exists($key, get_object_vars($array)) ? $array->$key : $default;
             }
 
             if ($array->isRelationPopulated($key)) {
@@ -118,7 +117,7 @@ public static function getValueByPath(ActiveRecordInterface|array $array, string
     }
 
     /**
-     * Populates an array of rows with the specified column value as keys.
+     * Indexes an array of rows with the specified column value as keys.
      *
      * The input array should be multidimensional or an array of {@see ActiveRecordInterface} instances.
      *
@@ -144,7 +143,7 @@ public static function getValueByPath(ActiveRecordInterface|array $array, string
      *
      * @return array[]
      */
-    public static function populate(array $rows, Closure|string|null $indexBy = null): array
+    public static function index(array $rows, Closure|string|null $indexBy = null): array
     {
         if ($indexBy === null) {
             return $rows;