Merge branch 'master' into refactor-delete

src/BaseActiveRecord.php

@@ -22,6 +22,7 @@
 use Yiisoft\Db\Helper\DbStringHelper;
 
 use function array_combine;
+use function array_diff;
 use function array_flip;
 use function array_intersect;
 use function array_key_exists;
@@ -116,15 +117,12 @@ public function getAttributes(array $names = null, array $except = []): array
             $names = $this->attributes();
         }
 
-        /** @psalm-var list<string> $names */
-        foreach ($names as $name) {
-            /** @psalm-var mixed */
-            $values[$name] = $this->$name;
+        if ($except !== []) {
+            $names = array_diff($names, $except);
         }
 
-        /** @psalm-var list<string> $except */
-        foreach ($except as $name) {
-            unset($values[$name]);
+        foreach ($names as $name) {
+            $values[$name] = $this->$name;
         }
 
         return $values;

tests/ActiveQueryTest.php

@@ -2133,6 +2133,17 @@ public function testGetAttributes(): void
         $this->assertEquals($attributes, $attributesExpected);
     }
 
+    public function testGetAttributesOnly(): void
+    {
+        $this->checkFixture($this->db, 'customer');
+
+        $customer = new ActiveQuery(Customer::class, $this->db);
+
+        $attributes = $customer->findOne(1)->getAttributes(['id', 'email', 'name']);
+
+        $this->assertEquals(['id' => 1, 'email' => '[email protected]', 'name' => 'user1'], $attributes);
+    }
+
     public function testGetAttributesExcept(): void
     {
         $this->checkFixture($this->db, 'customer');