Merge branch refs/heads/2.1.x into 2.2.x

Author: phpstan-bot

src/Rules/Methods/MethodCallableRule.php

@@ -5,12 +5,10 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Internal\SprintfHelper;
 use PHPStan\Node\MethodCallableNode;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use function sprintf;
 
 /**
  * @implements Rule<MethodCallableNode>
@@ -46,23 +44,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		$methodNameName = $methodName->toString();
 
-		[$errors, $methodReflection] = $this->methodCallCheck->check($scope, $methodNameName, $node->getVar(), $node->getName());
-		if ($methodReflection === null) {
-			return $errors;
-		}
-
-		$declaringClass = $methodReflection->getDeclaringClass();
-		if ($declaringClass->hasNativeMethod($methodNameName)) {
-			return $errors;
-		}
-
-		$messagesMethodName = SprintfHelper::escapeFormatString($declaringClass->getDisplayName() . '::' . $methodReflection->getName() . '()');
-
-		$errors[] = RuleErrorBuilder::message(sprintf('Creating callable from a non-native method %s.', $messagesMethodName))
-			->identifier('callable.nonNativeMethod')
-			->build();
-
-		return $errors;
+		return $this->methodCallCheck->check($scope, $methodNameName, $node->getVar(), $node->getName())[0];
 	}
 
 }

src/Rules/Methods/StaticMethodCallableRule.php

@@ -5,12 +5,10 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
-use PHPStan\Internal\SprintfHelper;
 use PHPStan\Node\StaticMethodCallableNode;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use function sprintf;
 
 /**
  * @implements Rule<StaticMethodCallableNode>
@@ -46,23 +44,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		$methodNameName = $methodName->toString();
 
-		[$errors, $methodReflection] = $this->methodCallCheck->check($scope, $methodNameName, $node->getClass(), $node->getName());
-		if ($methodReflection === null) {
-			return $errors;
-		}
-
-		$declaringClass = $methodReflection->getDeclaringClass();
-		if ($declaringClass->hasNativeMethod($methodNameName)) {
-			return $errors;
-		}
-
-		$messagesMethodName = SprintfHelper::escapeFormatString($declaringClass->getDisplayName() . '::' . $methodReflection->getName() . '()');
-
-		$errors[] = RuleErrorBuilder::message(sprintf('Creating callable from a non-native static method %s.', $messagesMethodName))
-			->identifier('callable.nonNativeMethod')
-			->build();
-
-		return $errors;
+		return $this->methodCallCheck->check($scope, $methodNameName, $node->getClass(), $node->getName())[0];
 	}
 
 }

tests/PHPStan/Rules/Methods/MethodCallableRuleTest.php

@@ -39,6 +39,12 @@ public function testNotSupportedOnOlderVersions(): void
 		]);
 	}
 
+	#[RequiresPhp('>= 8.1')]
+	public function testBug13596(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13596.php'], []);
+	}
+
 	#[RequiresPhp('>= 8.1')]
 	public function testRule(): void
 	{
@@ -68,14 +74,6 @@ public function testRule(): void
 				'Call to private method doFoo() of class MethodCallable\ParentClass.',
 				53,
 			],
-			[
-				'Creating callable from a non-native method MethodCallable\Lorem::doBar().',
-				66,
-			],
-			[
-				'Creating callable from a non-native method MethodCallable\Ipsum::doBar().',
-				85,
-			],
 		]);
 	}
 

tests/PHPStan/Rules/Methods/StaticMethodCallableRuleTest.php

@@ -93,14 +93,6 @@ public function testRule(): void
 				'Cannot call static method doFoo() on int.',
 				22,
 			],
-			[
-				'Creating callable from a non-native static method StaticMethodCallable\Lorem::doBar().',
-				47,
-			],
-			[
-				'Creating callable from a non-native static method StaticMethodCallable\Ipsum::doBar().',
-				66,
-			],
 		]);
 	}
 

tests/PHPStan/Rules/Methods/data/bug-13596.php

@@ -0,0 +1,31 @@
+<?php // lint >= 8.1
+
+namespace Bug13596;
+
+use Closure;
+
+class BaseClass
+{
+	public function getCallable(): ?Closure
+	{
+		return method_exists($this, 'myCallable') ? $this->myCallable(...) : null;
+	}
+
+	public function getCallableWithIsCallable(): ?Closure
+	{
+		return is_callable([$this, 'myCallable']) ? $this->myCallable(...) : null;
+	}
+}
+
+class ChildOne extends BaseClass
+{
+	//
+}
+
+class ChildTwo extends BaseClass
+{
+	public function myCallable(): string
+	{
+		return 'I exist on child two.';
+	}
+}