Refactor ActiveQuery::removeDuplicatedModels() to separate ArrayAccess implementation

src/ActiveQuery.php

@@ -23,6 +23,12 @@
 use Yiisoft\Definitions\Exception\NotInstantiableException;
 use Yiisoft\Factory\NotFoundException;
 
+use function array_column;
+use function array_combine;
+use function array_flip;
+use function array_intersect_key;
+use function array_key_first;
+use function array_map;
 use function array_merge;
 use function array_values;
 use function count;
@@ -289,53 +295,52 @@
      */
     private function removeDuplicatedModels(array $models): array
     {
-        $hash = [];
+        $model = reset($models);
 
-        $pks = $this->getARInstance()->primaryKey();
+        if ($this->asArray) {
+            $pks = $this->getARInstance()->primaryKey();
 
-        if (count($pks) > 1) {
-            // Composite primary key.
-            foreach ($models as $i => $model) {
-                $key = [];
-                foreach ($pks as $pk) {
-                    if (!isset($model[$pk])) {
-                        // Don't continue if the primary key isn't part of the result set.
-                        break 2;
-                    }
-                    $key[] = $model[$pk];
-                }
-
-                $key = serialize($key);
-
-                if (isset($hash[$key])) {
-                    unset($models[$i]);
-                } else {
-                    $hash[$key] = true;
-                }
+            if (empty($pks)) {
+                throw new InvalidConfigException("Primary key of '$this->arClass' can not be empty.");
             }
-        } elseif (empty($pks)) {
-            throw new InvalidConfigException("Primary key of '$this->arClass' can not be empty.");
-        } else {
-            // Single column primary key.
-            $pk = reset($pks);
 
-            foreach ($models as $i => $model) {
+            foreach ($pks as $pk) {
                 if (!isset($model[$pk])) {
-                    // Don't continue if the primary key isn't part of the result set.
-                    break;
+                    return $models;
                 }
+            }
 
-                $key = $model[$pk];
+            if (count($pks) === 1) {
+                $hash = array_column($models, reset($pks));
+            } else {
+                $flippedPks = array_flip($pks);
+                $hash = array_map(
+                    static fn ($model): string => serialize(array_intersect_key($model, $flippedPks)),
+                    $models
+                );
+            }
+        } else {
+            $pks = $model->getPrimaryKey(true);
 
-                if (isset($hash[$key])) {
-                    unset($models[$i]);
-                } else {
-                    $hash[$key] = true;
+            if (empty($pks)) {
+                throw new InvalidConfigException("Primary key of '$this->arClass' can not be empty.");
+            }
+
+            foreach ($pks as $pk) {
+                if ($pk === null) {
+                    return $models;
                 }
             }
+
+            if (count($pks) === 1) {
+                $key = array_key_first($pks);
+                $hash = array_map(static fn ($model): string => (string) $model->getAttribute($key), $models);
+            } else {
+                $hash = array_map(static fn ($model): string => serialize($model->getPrimaryKey(true)), $models);
+            }
         }
 
-        return array_values($models);
+        return array_values(array_combine($hash, $models));
     }
 
     /**