PropertyHookReturnStatementsNode is invoked for short body hooks

Author: ondrejmirtes

tests/PHPStan/Rules/Exceptions/MissingCheckedExceptionInPropertyHookThrowsRuleTest.php

@@ -45,6 +45,10 @@ public function testRule(): void
 				'Get hook for property MissingExceptionPropertyHookThrows\Foo::$m throws checked exception InvalidArgumentException but it\'s missing from the PHPDoc @throws tag.',
 				38,
 			],
+			[
+				'Get hook for property MissingExceptionPropertyHookThrows\Foo::$n throws checked exception InvalidArgumentException but it\'s missing from the PHPDoc @throws tag.',
+				43,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Exceptions/ThrowsVoidPropertyHookWithExplicitThrowPointRuleTest.php

@@ -44,6 +44,10 @@ public function dataRule(): array
 						'Get hook for property ThrowsVoidPropertyHook\Foo::$i throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
 						18,
 					],
+					[
+						'Get hook for property ThrowsVoidPropertyHook\Foo::$j throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
+						26,
+					],
 				],
 			],
 			[
@@ -59,6 +63,10 @@ public function dataRule(): array
 						'Get hook for property ThrowsVoidPropertyHook\Foo::$i throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
 						18,
 					],
+					[
+						'Get hook for property ThrowsVoidPropertyHook\Foo::$j throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
+						26,
+					],
 				],
 			],
 			[
@@ -69,6 +77,10 @@ public function dataRule(): array
 						'Get hook for property ThrowsVoidPropertyHook\Foo::$i throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
 						18,
 					],
+					[
+						'Get hook for property ThrowsVoidPropertyHook\Foo::$j throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
+						26,
+					],
 				],
 			],
 			[
@@ -79,6 +91,10 @@ public function dataRule(): array
 						'Get hook for property ThrowsVoidPropertyHook\Foo::$i throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
 						18,
 					],
+					[
+						'Get hook for property ThrowsVoidPropertyHook\Foo::$j throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
+						26,
+					],
 				],
 			],
 		];

tests/PHPStan/Rules/Exceptions/TooWidePropertyHookThrowTypeRuleTest.php

@@ -43,6 +43,10 @@ public function testRule(): void
 				'Get hook for property TooWideThrowsPropertyHook\Foo::$j has DomainException in PHPDoc @throws tag but it\'s not thrown.',
 				76,
 			],
+			[
+				'Get hook for property TooWideThrowsPropertyHook\Foo::$k has DomainException in PHPDoc @throws tag but it\'s not thrown.',
+				83,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Exceptions/data/missing-exception-property-hook-throws.php

@@ -39,4 +39,8 @@ class Foo
 		}
 	}
 
+	public int $n {
+		get => throw new \InvalidArgumentException(); // error
+	}
+
 }

tests/PHPStan/Rules/Exceptions/data/throws-void-property-hook.php

@@ -19,4 +19,11 @@ class Foo
 		}
 	}
 
+	public int $j {
+		/**
+		 * @throws void
+		 */
+		get => throw new MyException();
+	}
+
 }

tests/PHPStan/Rules/Exceptions/data/too-wide-throws-property-hook.php

@@ -78,4 +78,9 @@ class Foo
 		}
 	}
 
+	public int $k {
+		/** @throws \DomainException */
+		get => 11; // error - DomainException unused
+	}
+
 }

tests/PHPStan/Rules/Properties/data/set-non-virtual-property-hook-assign.php

@@ -65,4 +65,11 @@ class Foo
 		}
 	}
 
+	public int $k5 {
+		get {
+			return $this->k4 + 1;
+		}
+		set => $value; // short body always assigns
+	}
+
 }