Do not catch an Exception in isset() of magic properties (#276)

Tigrov · web-flow · commit c78469c6cab5 · 2023-12-16T12:51:47.000+07:00
diff --git a/src/BaseActiveRecordTrait.php b/src/BaseActiveRecordTrait.php
@@ -156,7 +156,7 @@ public function __isset(string $name): bool
     {
         try {
             return $this->__get($name) !== null;
-        } catch (Throwable) {
+        } catch (InvalidCallException|UnknownPropertyException) {
             return false;
         }
     }
diff --git a/tests/ActiveRecordTest.php b/tests/ActiveRecordTest.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\ActiveRecord\Tests;
 
+use DivisionByZeroError;
 use ReflectionException;
 use Yiisoft\ActiveRecord\ActiveQuery;
 use Yiisoft\ActiveRecord\Tests\Stubs\ActiveRecord\Animal;
@@ -392,7 +393,8 @@ public function testIssetException(): void
 
         $cat = new Cat($this->db);
 
-        $this->assertFalse(isset($cat->exception));
+        $this->expectException(Exception::class);
+        isset($cat->exception);
     }
 
     public function testIssetThrowable(): void
@@ -401,7 +403,18 @@ public function testIssetThrowable(): void
 
         $cat = new Cat($this->db);
 
-        $this->assertFalse(isset($cat->throwable));
+        $this->expectException(DivisionByZeroError::class);
+        isset($cat->throwable);
+    }
+
+    public function testIssetNonExisting(): void
+    {
+        $this->checkFixture($this->db, 'cat');
+
+        $cat = new Cat($this->db);
+
+        $this->assertFalse(isset($cat->non_existing));
+        $this->assertFalse(isset($cat->non_existing_property));
     }
 
     public function testSetAttributes(): void
diff --git a/tests/Stubs/ActiveRecord/Cat.php b/tests/Stubs/ActiveRecord/Cat.php
@@ -29,4 +29,8 @@ public function getThrowable(): float|int
     {
         return 5/0;
     }
+
+    public function setNonExistingProperty(string $value): void
+    {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public function __isset(string $name): bool`
`156`	`156`	`{`
`157`	`157`	`try {`
`158`	`158`	`return $this->__get($name) !== null;`
`159`		`- } catch (Throwable) {`
	`159`	`+ } catch (InvalidCallException\|UnknownPropertyException) {`
`160`	`160`	`return false;`
`161`	`161`	`}`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,8 @@ public function getThrowable(): float\|int`
`29`	`29`	`{`
`30`	`30`	`return 5/0;`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ public function setNonExistingProperty(string $value): void`
	`34`	`+ {`
	`35`	`+ }`
`32`	`36`	`}`