Skip to content

Commit 328803d

Browse files
zonuexezonuexe
committed
Fix for handling non-stringable types in dynamic method call
1 parent d17f8d0 commit 328803d

File tree

5 files changed

+139
-6
lines changed

5 files changed

+139
-6
lines changed

Diff for: ‎src/Rules/Methods/CallMethodsRule.php

+28-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@
88
use PHPStan\Internal\SprintfHelper;
99
use PHPStan\Reflection\ParametersAcceptorSelector;
1010
use PHPStan\Rules\FunctionCallParametersCheck;
11+
use PHPStan\Rules\IdentifierRuleError;
1112
use PHPStan\Rules\Rule;
13+
use PHPStan\Rules\RuleErrorBuilder;
14+
use PHPStan\Type\VerbosityLevel;
15+
use function array_map;
1216
use function array_merge;
17+
use function sprintf;
1318

1419
/**
1520
* @implements Rule<Node\Expr\MethodCall>
@@ -31,12 +36,32 @@ public function getNodeType(): string
3136

3237
public function processNode(Node $node, Scope $scope): array
3338
{
34-
if (!$node->name instanceof Node\Identifier) {
35-
return [];
39+
$errors = [];
40+
if ($node->name instanceof Node\Identifier) {
41+
$methodNames = [$node->name->name];
42+
} else {
43+
$callType = $scope->getType($node->name);
44+
$methodNames = array_map(static fn ($type): string => $type->getValue(), $callType->getConstantStrings());
45+
$callStringType = $callType->toString();
46+
if (!$callStringType->isString()->yes()) {
47+
$errors[] = RuleErrorBuilder::message(sprintf('Cannot call method name with a non-stringable type %s.', $callType->describe(VerbosityLevel::typeOnly())))
48+
->identifier('method.callNameInvalidExpression')
49+
->build();
50+
}
3651
}
3752

38-
$methodName = $node->name->name;
53+
foreach ($methodNames as $methodName) {
54+
$errors = array_merge($errors, $this->processSingleMethodCall($scope, $node, $methodName));
55+
}
56+
57+
return $errors;
58+
}
3959

60+
/**
61+
* @return list<IdentifierRuleError>
62+
*/
63+
private function processSingleMethodCall(Scope $scope, MethodCall $node, string $methodName): array
64+
{
4065
[$errors, $methodReflection] = $this->methodCallCheck->check($scope, $methodName, $node->var);
4166
if ($methodReflection === null) {
4267
return $errors;

Diff for: ‎src/Rules/Methods/CallStaticMethodsRule.php

+28-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
use PHPStan\Internal\SprintfHelper;
99
use PHPStan\Reflection\ParametersAcceptorSelector;
1010
use PHPStan\Rules\FunctionCallParametersCheck;
11+
use PHPStan\Rules\IdentifierRuleError;
1112
use PHPStan\Rules\Rule;
13+
use PHPStan\Rules\RuleErrorBuilder;
14+
use PHPStan\Type\VerbosityLevel;
15+
use function array_map;
1216
use function array_merge;
1317
use function sprintf;
1418

@@ -32,11 +36,32 @@ public function getNodeType(): string
3236

3337
public function processNode(Node $node, Scope $scope): array
3438
{
35-
if (!$node->name instanceof Node\Identifier) {
36-
return [];
39+
$errors = [];
40+
if ($node->name instanceof Node\Identifier) {
41+
$methodNames = [$node->name->name];
42+
} else {
43+
$callType = $scope->getType($node->name);
44+
$methodNames = array_map(static fn ($type): string => $type->getValue(), $callType->getConstantStrings());
45+
$callStringType = $callType->toString();
46+
if (!$callStringType->isString()->yes()) {
47+
$errors[] = RuleErrorBuilder::message(sprintf('Cannot call static method name with a non-stringable type %s.', $callType->describe(VerbosityLevel::typeOnly())))
48+
->identifier('staticMethod.callNameInvalidExpression')
49+
->build();
50+
}
3751
}
38-
$methodName = $node->name->name;
3952

53+
foreach ($methodNames as $methodName) {
54+
$errors = array_merge($errors, $this->processSingleMethodCall($scope, $node, $methodName));
55+
}
56+
57+
return $errors;
58+
}
59+
60+
/**
61+
* @return list<IdentifierRuleError>
62+
*/
63+
private function processSingleMethodCall(Scope $scope, StaticCall $node, string $methodName): array
64+
{
4065
[$errors, $method] = $this->methodCallCheck->check($scope, $methodName, $node->class);
4166
if ($method === null) {
4267
return $errors;

Diff for: ‎tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

+26
Original file line numberDiff line numberDiff line change
@@ -3552,4 +3552,30 @@ public function testBug6828(): void
35523552
$this->analyse([__DIR__ . '/data/bug-6828.php'], []);
35533553
}
35543554

3555+
public function testBug9475(): void
3556+
{
3557+
$this->checkThisOnly = false;
3558+
$this->checkNullables = true;
3559+
$this->checkUnionTypes = true;
3560+
$this->checkExplicitMixed = true;
3561+
$this->analyse([__DIR__ . '/data/bug-9475.php'], [
3562+
[
3563+
'Cannot call method name with a non-stringable type $this(Bug9475\Methods).',
3564+
12,
3565+
],
3566+
[
3567+
'Cannot call method name with a non-stringable type $this(Bug9475\Methods).',
3568+
13,
3569+
],
3570+
[
3571+
'Cannot call method name with a non-stringable type object.',
3572+
14,
3573+
],
3574+
[
3575+
'Cannot call method name with a non-stringable type array.',
3576+
15,
3577+
],
3578+
]);
3579+
}
3580+
35553581
}

Diff for: ‎tests/PHPStan/Rules/Methods/CallStaticMethodsRuleTest.php

+25
Original file line numberDiff line numberDiff line change
@@ -862,4 +862,29 @@ public function testBug12015(): void
862862
$this->analyse([__DIR__ . '/data/bug-12015.php'], []);
863863
}
864864

865+
public function testBug9475(): void
866+
{
867+
$this->checkThisOnly = false;
868+
$this->checkExplicitMixed = true;
869+
$this->checkImplicitMixed = true;
870+
$this->analyse([__DIR__ . '/data/bug-9475.php'], [
871+
[
872+
'Cannot call static method name with a non-stringable type $this(Bug9475\Methods).',
873+
23,
874+
],
875+
[
876+
'Cannot call static method name with a non-stringable type $this(Bug9475\Methods).',
877+
24,
878+
],
879+
[
880+
'Cannot call static method name with a non-stringable type object.',
881+
25,
882+
],
883+
[
884+
'Cannot call static method name with a non-stringable type array.',
885+
26,
886+
],
887+
]);
888+
}
889+
865890
}

Diff for: ‎tests/PHPStan/Rules/Methods/data/bug-9475.php

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace Bug9475;
4+
5+
use Stringable;
6+
7+
final class Methods
8+
{
9+
10+
public function testMethods(string $name, Stringable $stringable, object $object, array $array): void
11+
{
12+
echo 'Hello, ' . $this->{$this}();
13+
echo 'Hello, ' . $this->$this();
14+
echo 'Hello, ' . $this->$object();
15+
echo 'Hello, ' . $this->$array();
16+
17+
echo 'Hello, ' . $this->$name(); // valid
18+
echo 'Hello, ' . $this->$stringable(); // valid
19+
}
20+
21+
public function testStaticMethods(string $name, Stringable $stringable, object $object, array $array): void
22+
{
23+
echo 'Hello, ' . self::{$this}();
24+
echo 'Hello, ' . self::$this();
25+
echo 'Hello, ' . self::$object();
26+
echo 'Hello, ' . self::$array();
27+
28+
echo 'Hello, ' . self::$name(); // valid
29+
echo 'Hello, ' . self::$stringable(); // valid
30+
}
31+
32+
}

0 commit comments

Comments
 (0)