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

Tigrov · web-flow · commit ad73d8f417e4 · 2024-05-25T18:24:20.000+07:00
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;

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ public function populate(array $rows, Closure\|string\|null $indexBy = null): arra`
`275`	`275`	`$this->addInverseRelations($models);`
`276`	`276`	`}`
`277`	`277`
`278`		`- return ArArrayHelper::populate($models, $indexBy);`
	`278`	`+ return ArArrayHelper::index($models, $indexBy);`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,7 @@ public static function getValueByPath(ActiveRecordInterface\|array $array, string`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (property_exists($array, $key)) {`
`99`		`- $values = get_object_vars($array);`
`100`		`- return array_key_exists($key, $values) ? $values[$key] : $default;`
	`99`	`+ return array_key_exists($key, get_object_vars($array)) ? $array->$key : $default;`
`101`	`100`	`}`
`102`	`101`
`103`	`102`	`if ($array->isRelationPopulated($key)) {`
`@@ -118,7 +117,7 @@ public static function getValueByPath(ActiveRecordInterface\|array $array, string`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`/**`
`121`		`- * Populates an array of rows with the specified column value as keys.`
	`120`	`+ * Indexes an array of rows with the specified column value as keys.`
`122`	`121`	`*`
`123`	`122`	`* The input array should be multidimensional or an array of {@see ActiveRecordInterface} instances.`
`124`	`123`	`*`
`@@ -144,7 +143,7 @@ public static function getValueByPath(ActiveRecordInterface\|array $array, string`
`144`	`143`	`*`
`145`	`144`	`* @return array[]`
`146`	`145`	`*/`
`147`		`- public static function populate(array $rows, Closure\|string\|null $indexBy = null): array`
	`146`	`+ public static function index(array $rows, Closure\|string\|null $indexBy = null): array`
`148`	`147`	`{`
`149`	`148`	`if ($indexBy === null) {`
`150`	`149`	`return $rows;`