Improve performance

yiisoft · May 28, 2024 · a10a84c · a10a84c
1 parent 9956a71
commit a10a84c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/AbstractActiveRecord.php b/src/AbstractActiveRecord.php
@@ -190,10 +190,8 @@ public function getOldPrimaryKey(bool $asArray = false): mixed
             );
         }
 
-        if (count($keys) === 1) {
-            $key = $this->oldAttributes[$keys[0]] ?? null;
-
-            return $asArray ? [$keys[0] => $key] : $key;
+        if ($asArray === false && count($keys) === 1) {
+            return $this->oldAttributes[reset($keys)] ?? null;
         }
 
         $values = [];
@@ -209,8 +207,8 @@ public function getPrimaryKey(bool $asArray = false): mixed
     {
         $keys = $this->primaryKey();
 
-        if (count($keys) === 1) {
-            return $asArray ? [$keys[0] => $this->getAttribute($keys[0])] : $this->getAttribute($keys[0]);
+        if ($asArray === false && count($keys) === 1) {
+            return $this->getAttribute(reset($keys));
         }
 
         $values = [];