Skip to content

Commit 2af9610

Browse files
phpstan-botclaude
andauthored
Look up object class names in nullable and mixed unions and class-strings in restricted-usage rules (#7006)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 539483e commit 2af9610

17 files changed

Lines changed: 345 additions & 8 deletions

‎src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PHPStan\Rules\RuleLevelHelper;
1616
use PHPStan\Type\ErrorType;
1717
use PHPStan\Type\Type;
18+
use PHPStan\Type\TypeCombinator;
1819

1920
/**
2021
* @implements Rule<Node\Expr\ClassConstFetch>
@@ -71,7 +72,7 @@ public function processNode(Node $node, Scope $scope): array
7172
return [];
7273
}
7374

74-
$referencedClasses = $classTypeResult->getReferencedClasses();
75+
$referencedClasses = TypeCombinator::removeNull($classTypeResult->getType())->getObjectTypeOrClassStringObjectType()->getObjectClassNames();
7576
}
7677

7778
$errors = [];

‎src/Rules/RestrictedUsage/RestrictedMethodCallableUsageRule.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
use PHPStan\Reflection\ReflectionProvider;
1313
use PHPStan\Rules\Rule;
1414
use PHPStan\Rules\RuleErrorBuilder;
15+
use PHPStan\Type\ObjectWithoutClassType;
16+
use PHPStan\Type\TypeCombinator;
1517

1618
/**
1719
* @implements Rule<MethodCallableNode>
@@ -52,7 +54,7 @@ public function processNode(Node $node, Scope $scope): array
5254

5355
$methodName = $node->getName()->name;
5456
$methodCalledOnType = $scope->getType($node->getVar());
55-
$referencedClasses = $methodCalledOnType->getObjectClassNames();
57+
$referencedClasses = TypeCombinator::intersect($methodCalledOnType, new ObjectWithoutClassType())->getObjectClassNames();
5658

5759
$errors = [];
5860

‎src/Rules/RestrictedUsage/RestrictedMethodUsageRule.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
use PHPStan\Reflection\ReflectionProvider;
1313
use PHPStan\Rules\Rule;
1414
use PHPStan\Rules\RuleErrorBuilder;
15+
use PHPStan\Type\ObjectWithoutClassType;
16+
use PHPStan\Type\TypeCombinator;
1517

1618
/**
1719
* @implements Rule<MethodCall>
@@ -52,7 +54,7 @@ public function processNode(Node $node, Scope $scope): array
5254

5355
$methodName = $node->name->name;
5456
$methodCalledOnType = $scope->getType($node->var);
55-
$referencedClasses = $methodCalledOnType->getObjectClassNames();
57+
$referencedClasses = TypeCombinator::intersect($methodCalledOnType, new ObjectWithoutClassType())->getObjectClassNames();
5658

5759
$errors = [];
5860

‎src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
use PHPStan\Reflection\ReflectionProvider;
1212
use PHPStan\Rules\Rule;
1313
use PHPStan\Rules\RuleErrorBuilder;
14+
use PHPStan\Type\ObjectWithoutClassType;
15+
use PHPStan\Type\TypeCombinator;
1416

1517
/**
1618
* @implements Rule<Node\Expr\PropertyFetch>
@@ -51,7 +53,7 @@ public function processNode(Node $node, Scope $scope): array
5153

5254
$propertyName = $node->name->name;
5355
$propertyCalledOnType = $scope->getType($node->var);
54-
$referencedClasses = $propertyCalledOnType->getObjectClassNames();
56+
$referencedClasses = TypeCombinator::intersect($propertyCalledOnType, new ObjectWithoutClassType())->getObjectClassNames();
5557

5658
$errors = [];
5759

‎src/Rules/RestrictedUsage/RestrictedStaticMethodCallableUsageRule.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use PHPStan\Rules\RuleLevelHelper;
1717
use PHPStan\Type\ErrorType;
1818
use PHPStan\Type\Type;
19+
use PHPStan\Type\TypeCombinator;
1920

2021
/**
2122
* @implements Rule<StaticMethodCallableNode>
@@ -72,7 +73,7 @@ public function processNode(Node $node, Scope $scope): array
7273
return [];
7374
}
7475

75-
$referencedClasses = $classTypeResult->getReferencedClasses();
76+
$referencedClasses = TypeCombinator::removeNull($classTypeResult->getType())->getObjectTypeOrClassStringObjectType()->getObjectClassNames();
7677
}
7778

7879
$errors = [];

‎src/Rules/RestrictedUsage/RestrictedStaticMethodUsageRule.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PHPStan\Rules\RuleLevelHelper;
1616
use PHPStan\Type\ErrorType;
1717
use PHPStan\Type\Type;
18+
use PHPStan\Type\TypeCombinator;
1819

1920
/**
2021
* @implements Rule<Node\Expr\StaticCall>
@@ -71,7 +72,7 @@ public function processNode(Node $node, Scope $scope): array
7172
return [];
7273
}
7374

74-
$referencedClasses = $classTypeResult->getReferencedClasses();
75+
$referencedClasses = TypeCombinator::removeNull($classTypeResult->getType())->getObjectTypeOrClassStringObjectType()->getObjectClassNames();
7576
}
7677

7778
$errors = [];

‎src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use PHPStan\Rules\RuleLevelHelper;
1616
use PHPStan\Type\ErrorType;
1717
use PHPStan\Type\Type;
18+
use PHPStan\Type\TypeCombinator;
1819

1920
/**
2021
* @implements Rule<Node\Expr\StaticPropertyFetch>
@@ -71,7 +72,7 @@ public function processNode(Node $node, Scope $scope): array
7172
return [];
7273
}
7374

74-
$referencedClasses = $classTypeResult->getReferencedClasses();
75+
$referencedClasses = TypeCombinator::removeNull($classTypeResult->getType())->getObjectTypeOrClassStringObjectType()->getObjectClassNames();
7576
}
7677

7778
$errors = [];

‎src/Rules/RestrictedUsage/RestrictedUsageOfDeprecatedStringCastRule.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
use PHPStan\Reflection\ReflectionProvider;
1212
use PHPStan\Rules\Rule;
1313
use PHPStan\Rules\RuleErrorBuilder;
14+
use PHPStan\Type\ObjectWithoutClassType;
15+
use PHPStan\Type\TypeCombinator;
1416

1517
/**
1618
* @implements Rule<Cast\String_>
@@ -43,7 +45,7 @@ public function processNode(Node $node, Scope $scope): array
4345
}
4446

4547
$exprType = $scope->getType($node->expr);
46-
$referencedClasses = $exprType->getObjectClassNames();
48+
$referencedClasses = TypeCombinator::intersect($exprType, new ObjectWithoutClassType())->getObjectClassNames();
4749

4850
$errors = [];
4951

‎tests/PHPStan/Rules/RestrictedUsage/RestrictedClassConstantUsageRuleTest.php‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PHPStan\Rules\Rule;
66
use PHPStan\Rules\RuleLevelHelper;
77
use PHPStan\Testing\RuleTestCase;
8+
use PHPUnit\Framework\Attributes\RequiresPhp;
89

910
/**
1011
* @extends RuleTestCase<RestrictedClassConstantUsageRule>
@@ -41,6 +42,33 @@ public function testRule(): void
4142
]);
4243
}
4344

45+
#[RequiresPhp('>= 8.1.0')]
46+
public function testBug15681(): void
47+
{
48+
$this->analyse([__DIR__ . '/data/bug-15681.php'], [
49+
[
50+
'Cannot access FOO',
51+
73,
52+
],
53+
[
54+
'Cannot access FOO',
55+
85,
56+
],
57+
[
58+
'Cannot access FOO',
59+
90,
60+
],
61+
[
62+
'Cannot access FOO',
63+
118,
64+
],
65+
[
66+
'Cannot access FOO',
67+
123,
68+
],
69+
]);
70+
}
71+
4472
public static function getAdditionalConfigFiles(): array
4573
{
4674
return [

‎tests/PHPStan/Rules/RestrictedUsage/RestrictedMethodCallableUsageRuleTest.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,21 @@ public function testRule(): void
3131
]);
3232
}
3333

34+
#[RequiresPhp('>= 8.1.0')]
35+
public function testBug15681(): void
36+
{
37+
$this->analyse([__DIR__ . '/data/bug-15681.php'], [
38+
[
39+
'Cannot call doFoo',
40+
64,
41+
],
42+
[
43+
'Cannot call doFoo',
44+
65,
45+
],
46+
]);
47+
}
48+
3449
public static function getAdditionalConfigFiles(): array
3550
{
3651
return [

0 commit comments

Comments
 (0)