Lint exclusions, unify implementations

Author: DanielEScherzer

Makefile

@@ -110,6 +110,8 @@ lint:
 		--exclude tests/PHPStan/Rules/Classes/data/enum-cannot-be-attribute.php \
 		--exclude tests/PHPStan/Rules/Classes/data/class-attributes.php \
 		--exclude tests/PHPStan/Rules/Classes/data/enum-attributes.php \
+		--exclude tests/PHPStan/Rules/Cast/data/void-cast.php \
+		--exclude tests/PHPStan/Rules/Properties/data/property-hook-attributes.php \
 		src tests
 
 install-paratest:

build/collision-detector.json

@@ -18,6 +18,7 @@
 		"../tests/PHPStan/Rules/Properties/data/final-property-hooks.php",
 		"../tests/PHPStan/Rules/Functions/data/function-call-statement-result-discarded.php",
 		"../tests/PHPStan/Rules/Methods/data/method-call-statement-result-discarded.php",
-		"../tests/PHPStan/Rules/Methods/data/static-method-call-statement-result-discarded.php"
+		"../tests/PHPStan/Rules/Methods/data/static-method-call-statement-result-discarded.php",
+		"../tests/PHPStan/Rules/Properties/data/property-hook-attributes.php"
     ]
 }

src/Rules/Methods/CallToMethodStatementWithNoDiscardRule.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Rules\Methods;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\NullsafeOperatorHelper;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
@@ -16,7 +15,7 @@
 use function sprintf;
 
 /**
- * @implements Rule<MethodCall>
+ * @implements Rule<Node\Stmt\Expression>
  */
 #[RegisteredRule(level: 4)]
 final class CallToMethodStatementWithNoDiscardRule implements Rule
@@ -28,24 +27,29 @@ public function __construct(private RuleLevelHelper $ruleLevelHelper)
 
 	public function getNodeType(): string
 	{
-		// We can ignore NullsafeMethodCall because a virtual MethodCall will
-		// also be processed
-		return MethodCall::class;
+		return Node\Stmt\Expression::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node->name instanceof Node\Identifier) {
+		if (!$node->expr instanceof Node\Expr\MethodCall
+			&& !$node->expr instanceof Node\Expr\NullsafeMethodCall
+		) {
 			return [];
 		}
-		if ($node->hasAttribute(VoidCastVisitor::ATTRIBUTE_NAME)) {
+
+		$funcCall = $node->expr;
+		if (!$funcCall->name instanceof Node\Identifier) {
+			return [];
+		}
+		if ($funcCall->hasAttribute(VoidCastVisitor::ATTRIBUTE_NAME)) {
 			return [];
 		}
-		$methodName = $node->name->toString();
+		$methodName = $funcCall->name->toString();
 
 		$typeResult = $this->ruleLevelHelper->findTypeToCheck(
 			$scope,
-			NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $node->var),
+			NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $funcCall->var),
 			'',
 			static fn (Type $type): bool => $type->canCallMethods()->yes() && $type->hasMethod($methodName)->yes(),
 		);

src/Rules/Methods/CallToStaticMethodStatementWithNoDiscardRule.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Rules\Methods;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\NullsafeOperatorHelper;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
@@ -18,7 +17,7 @@
 use function sprintf;
 
 /**
- * @implements Rule<StaticCall>
+ * @implements Rule<Node\Stmt\Expression>
  */
 #[RegisteredRule(level: 4)]
 final class CallToStaticMethodStatementWithNoDiscardRule implements Rule
@@ -33,21 +32,26 @@ public function __construct(
 
 	public function getNodeType(): string
 	{
-		return Node\Expr\StaticCall::class;
+		return Node\Stmt\Expression::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$node->name instanceof Node\Identifier) {
+		if (!$node->expr instanceof Node\Expr\StaticCall) {
 			return [];
 		}
-		if ($node->hasAttribute(VoidCastVisitor::ATTRIBUTE_NAME)) {
+
+		$funcCall = $node->expr;
+		if (!$funcCall->name instanceof Node\Identifier) {
+			return [];
+		}
+		if ($funcCall->hasAttribute(VoidCastVisitor::ATTRIBUTE_NAME)) {
 			return [];
 		}
 
-		$methodName = $node->name->toString();
-		if ($node->class instanceof Node\Name) {
-			$className = $scope->resolveName($node->class);
+		$methodName = $funcCall->name->toString();
+		if ($funcCall->class instanceof Node\Name) {
+			$className = $scope->resolveName($funcCall->class);
 			if (!$this->reflectionProvider->hasClass($className)) {
 				return [];
 			}
@@ -56,7 +60,7 @@ public function processNode(Node $node, Scope $scope): array
 		} else {
 			$typeResult = $this->ruleLevelHelper->findTypeToCheck(
 				$scope,
-				NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $node->class),
+				NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $funcCall->class),
 				'',
 				static fn (Type $type): bool => $type->canCallMethods()->yes() && $type->hasMethod($methodName)->yes(),
 			);

tests/PHPStan/Rules/Functions/data/function-call-statement-result-discarded.php

@@ -3,11 +3,15 @@
 namespace FunctionCallStatementResultDiscarded;
 
 #[\NoDiscard]
-function withSideEffects(): int {
+function withSideEffects(): array {
 	echo __FUNCTION__ . "\n";
-	return 1;
+	return [1];
 }
 
 withSideEffects();
 
 (void)withSideEffects();
+
+foreach (withSideEffects() as $num) {
+	var_dump($num);
+}

tests/PHPStan/Rules/Methods/data/method-call-statement-result-discarded.php

@@ -4,9 +4,9 @@
 
 class ClassWithInstanceSideEffects {
 	#[\NoDiscard]
-	public function instanceMethod(): int {
+	public function instanceMethod(): array {
 		echo __METHOD__ . "\n";
-		return 2;
+		return [2];
 	}
 }
 
@@ -16,3 +16,7 @@ public function instanceMethod(): int {
 
 (void)$o->instanceMethod();
 (void)$o?->instanceMethod();
+
+foreach ($o->instanceMethod() as $num) {
+	var_dump($num);
+}

tests/PHPStan/Rules/Methods/data/static-method-call-statement-result-discarded.php

@@ -4,12 +4,16 @@
 
 class ClassWithStaticSideEffects {
 	#[\NoDiscard]
-	public static function staticMethod(): int {
+	public static function staticMethod(): array {
 		echo __METHOD__ . "\n";
-		return 2;
+		return [2];
 	}
 }
 
 ClassWithStaticSideEffects::staticMethod();
 
 (void)ClassWithStaticSideEffects::staticMethod();
+
+foreach (ClassWithStaticSideEffects::staticMethod() as $num) {
+	var_dump($num);
+}