Handle allowed static invocations when in the class.

phpstan · Nov 11, 2021 · a9cfcd5 · a9cfcd5
1 parent 18d1f10
commit a9cfcd5
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 31 deletions.
diff --git a/src/Rules/DeadCode/UnusedPrivateMethodRule.php b/src/Rules/DeadCode/UnusedPrivateMethodRule.php
@@ -114,7 +114,7 @@ public function processNode(Node $node, Scope $scope): array
 				if (!$arrayType instanceof ConstantArrayType) {
 					continue;
 				}
-				$typeAndMethod = $arrayType->findTypeAndMethodName();
+				$typeAndMethod = $arrayType->findTypeAndMethodName($scope);
 				if ($typeAndMethod === null) {
 					continue;
 				}

diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -315,7 +315,7 @@ public function equals(Type $type): bool
 
 	public function isCallable(): TrinaryLogic
 	{
-		$typeAndMethod = $this->findTypeAndMethodName();
+		$typeAndMethod = $this->findTypeAndMethodName(new OutOfClassScope());
 		if ($typeAndMethod === null) {
 			return TrinaryLogic::createNo();
 		}
@@ -329,7 +329,7 @@ public function isCallable(): TrinaryLogic
 	 */
 	public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope): array
 	{
-		$typeAndMethodName = $this->findTypeAndMethodName();
+		$typeAndMethodName = $this->findTypeAndMethodName($scope);
 		if ($typeAndMethodName === null) {
 			throw new \PHPStan\ShouldNotHappenException();
 		}
@@ -348,7 +348,7 @@ public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope)
 		return $method->getVariants();
 	}
 
-	public function findTypeAndMethodName(): ?ConstantArrayTypeAndMethod
+	public function findTypeAndMethodName(?ClassMemberAccessAnswerer $scope): ?ConstantArrayTypeAndMethod
 	{
 		if (count($this->keyTypes) !== 2) {
 			return null;
@@ -390,12 +390,16 @@ public function findTypeAndMethodName(): ?ConstantArrayTypeAndMethod
 			if ($this->isOptionalKey(0) || $this->isOptionalKey(1)) {
 				$has = $has->and(TrinaryLogic::createMaybe());
 			}
+			if (!$scope) {
+				$scope = new OutOfClassScope();
+			}
 			if (
 				$isClassString
 				&& $has->yes()
-				&& !$type->getMethod($method->getValue(), new OutOfClassScope())->isStatic()
+				&& !$scope->isInClass()
+				&& !$type->getMethod($method->getValue(), $scope)->isStatic()
 			) {
-				return null;
+				$has = $has->and(TrinaryLogic::createMaybe());
 			}
 
 			return ConstantArrayTypeAndMethod::createConcrete($type, $method->getValue(), $has);

diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
@@ -200,7 +200,17 @@ public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope)
 				if (!$scope->canCallMethod($method)) {
 					return [new InaccessibleMethod($method)];
 				}
-				if (!$method->isStatic()) {
+
+				if (!$scope->isInClass() && !$method->isStatic()) {
+					return [new InaccessibleMethod($method)];
+				}
+
+				if (
+					!$method->isStatic()
+					&& $scope->isInClass()
+					&& $scope->getClassReflection()->getName() !== $classReflection->getName()
+					&& !$scope->getClassReflection()->isSubclassOf($classReflection->getName())
+				) {
 					return [new InaccessibleMethod($method)];
 				}
 

diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -8236,20 +8236,20 @@ public function dataCallables(): array
 				'$closure()',
 			],
 			[
-				'*ERROR*',
+				'Callables\Bar',
 				'$arrayWithStaticMethod()',
 			],
 			[
 				'Callables\\Bar',
-				'$arrayWithStaticMethodActual()',
+				'$arrayWithStaticMethodActuallyStatic()',
 			],
 			[
-				'mixed',
+				'float',
 				'$stringWithStaticMethod()',
 			],
 			[
 				'float',
-				'$stringWithStaticMethodActual()',
+				'$stringWithStaticMethodActuallyStatic()',
 			],
 			[
 				'float',

diff --git a/tests/PHPStan/Analyser/data/callables.php b/tests/PHPStan/Analyser/data/callables.php
@@ -12,14 +12,14 @@ public function doFoo(): float
 		};
 		$foo = $this;
 		$arrayWithStaticMethod = ['Callables\\Foo', 'doBar'];
-		$arrayWithStaticMethodActual = ['Callables\\Foo', 'doBarActual'];
+		$arrayWithStaticMethodActuallyStatic = ['Callables\\Foo', 'doBarActuallyStatic'];
 		$stringWithStaticMethod = 'Callables\\Foo::doFoo';
-		$stringWithStaticMethodActual = 'Callables\\Foo::doFooActual';
+		$stringWithStaticMethodActuallyStatic = 'Callables\\Foo::doFooActuallyStatic';
 		$arrayWithInstanceMethod = [$this, 'doFoo'];
 		die;
 	}
 
-	public static function doFooActual(): float {
+	public static function doFooActuallyStatic(): float {
 
 	}
 
@@ -28,7 +28,7 @@ public function doBar(): Bar
 
 	}
 
-	public static function doBarActual(): Bar
+	public static function doBarActuallyStatic(): Bar
 	{
 
 	}

diff --git a/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php
@@ -432,28 +432,27 @@ public function testBug1971(): void
 	{
 		$this->checkThisOnly = false;
 		$this->analyse([__DIR__ . '/data/bug-1971.php'], [
-			[
-				'Parameter #1 $callback of static method Closure::fromCallable() expects callable(): mixed, array{\'Bug1971\\\HelloWorld\', \'sayHello\'} given.',
-				14,
-			],
-			[
-				'Parameter #1 $callback of static method Closure::fromCallable() expects callable(): mixed, array{class-string<static(Bug1971\\HelloWorld)>, \'sayHello\'} given.',
-				15,
-			],
 			[
 				'Parameter #1 $callback of static method Closure::fromCallable() expects callable(): mixed, array{class-string<static(Bug1971\\HelloWorld)>, \'sayHello2\'} given.',
-				16,
+				18,
 			],
 		]);
 	}
 
 	public function testBug5782(): void
 	{
+		if (PHP_VERSION_ID >= 80000) {
+			$this->markTestSkipped('Fatal error in PHP 8.0');
+		}
 		$this->checkThisOnly = false;
 		$this->analyse([__DIR__ . '/data/bug-5782.php'], [
 			[
-				'Parameter #1 $callback of static method Closure::fromCallable() expects callable(): mixed, array{class-string<static(Bug5782\\HelloWorld)>, \'sayHello2\'} given.',
-				16,
+				'Parameter #1 $callback of static method Closure::fromCallable() expects callable(): mixed, array{\'Bug5782\\\HelloWorld\', \'sayGoodbye\'} given.',
+				22,
+			],
+			[
+				'Parameter #1 $callback of static method Closure::fromCallable() expects callable(): mixed, array{\'Bug5782\\\HelloWorld\', \'sayGoodbye\'} given.',
+				23,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Methods/data/bug-1971.php b/tests/PHPStan/Rules/Methods/data/bug-1971.php
@@ -13,6 +13,8 @@ public function getClosure(): void
 	{
 		$closure1 = \Closure::fromCallable([self::class, 'sayHello']);
 		$closure2 = \Closure::fromCallable([static::class, 'sayHello']);
+		$closure3 = \Closure::fromCallable('Bug1971\HelloWorld::sayHello');
+		$closure4 = \Closure::fromCallable([\Bug1971\HelloWorld::class, 'sayHello']);
 		$closure2 = \Closure::fromCallable([static::class, 'sayHello2']);
 	}
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-5782.php b/tests/PHPStan/Rules/Methods/data/bug-5782.php
@@ -6,13 +6,22 @@ class HelloWorld
 {
 	public static function sayHello(): void
 	{
-		echo 'Hello';
+
 	}
 
-	public function getClosure(): void
+	public function sayGoodbye(): void
 	{
-		$closure1 = \Closure::fromCallable([self::class, 'sayHello']);
-		$closure2 = \Closure::fromCallable([static::class, 'sayHello']);
-		$closure2 = \Closure::fromCallable([static::class, 'sayHello2']);
+
 	}
+
+}
+
+function baz() {
+	$closure1 = \Closure::fromCallable([\Bug5782\HelloWorld::class, 'sayHello']);
+	$closure2 = \Closure::fromCallable('\Bug5782\HelloWorld::sayHello');
+	$closure3 = \Closure::fromCallable([\Bug5782\HelloWorld::class, 'sayGoodbye']);
+	// @todo this should also error on mixed type, but doesn't?
+	// ConstantStringType::getCallableParametersAcceptors returns a MixedType
+	// but that doesn't cause an error like ConstantArrayType.
+	$closure4 = \Closure::fromCallable('Bug5782\HelloWorld::sayGoodbye');
 }