Refactor BaseActiveRecord::getAttributes() (#279)

Tigrov · web-flow · commit eb86518cd825 · 2023-12-29T13:59:05.000+07:00
diff --git a/src/BaseActiveRecord.php b/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;
@@ -140,15 +141,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;
diff --git a/tests/ActiveQueryTest.php b/tests/ActiveQueryTest.php
@@ -2103,6 +2103,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' => 'user1@example.com', 'name' => 'user1'], $attributes);
+    }
+
     public function testGetAttributesExcept(): void
     {
         $this->checkFixture($this->db, 'customer');
diff --git a/tests/Stubs/ActiveRecord/Cat.php b/tests/Stubs/ActiveRecord/Cat.php
@@ -27,7 +27,7 @@ public function getException(): void
      */
     public function getThrowable(): float|int
     {
-        return 5/0;
+        return 5 / 0;
     }
 
     public function setNonExistingProperty(string $value): void

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function getException(): void`
`27`	`27`	`*/`
`28`	`28`	`public function getThrowable(): float\|int`
`29`	`29`	`{`
`30`		`- return 5/0;`
	`30`	`+ return 5 / 0;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function setNonExistingProperty(string $value): void`