Skip to content

Commit c314636

Browse files
committed
more precise name
1 parent 290148a commit c314636

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/Analyser/NodeScopeResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
use PHPStan\Node\MethodCallableNode;
102102
use PHPStan\Node\MethodReturnStatementsNode;
103103
use PHPStan\Node\NoopExpressionNode;
104-
use PHPStan\Node\NullsafeFirstClassCallableNode;
104+
use PHPStan\Node\NullsafeMethodCallOnFirstClassCallableNode;
105105
use PHPStan\Node\PropertyAssignNode;
106106
use PHPStan\Node\PropertyHookReturnStatementsNode;
107107
use PHPStan\Node\PropertyHookStatementNode;
@@ -2760,7 +2760,7 @@ public function processExprNode(
27602760
// $foo?->bar(...) is a fatal error in PHP ("Cannot combine nullsafe
27612761
// operator with Closure creation"), but it must not crash the analyser.
27622762
// The error is reported by NullsafeFirstClassCallableRule.
2763-
$newExpr = new NullsafeFirstClassCallableNode($expr->var, $expr->name, $expr);
2763+
$newExpr = new NullsafeMethodCallOnFirstClassCallableNode($expr->var, $expr->name, $expr);
27642764
} elseif ($expr instanceof StaticCall) {
27652765
$newExpr = new StaticMethodCallableNode($expr->class, $expr->name, $expr);
27662766
} elseif ($expr instanceof New_ && !$expr->class instanceof Class_) {

src/Node/NullsafeFirstClassCallableNode.php renamed to src/Node/NullsafeMethodCallOnFirstClassCallableNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* @api
1515
*/
16-
final class NullsafeFirstClassCallableNode extends Expr implements VirtualNode
16+
final class NullsafeMethodCallOnFirstClassCallableNode extends Expr implements VirtualNode
1717
{
1818

1919
public function __construct(

‎src/Node/Printer/Printer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
use PHPStan\Node\InstantiationCallableNode;
3333
use PHPStan\Node\IssetExpr;
3434
use PHPStan\Node\MethodCallableNode;
35-
use PHPStan\Node\NullsafeFirstClassCallableNode;
35+
use PHPStan\Node\NullsafeMethodCallOnFirstClassCallableNode;
3636
use PHPStan\Node\StaticMethodCallableNode;
3737
use PHPStan\Type\VerbosityLevel;
3838
use function preg_match;
@@ -184,7 +184,7 @@ protected function pPHPStan_Node_MethodCallableNode(MethodCallableNode $expr): s
184184
return sprintf('__phpstanMethodCallable(%s)', $this->p($expr->getOriginalNode()));
185185
}
186186

187-
protected function pPHPStan_Node_NullsafeFirstClassCallableNode(NullsafeFirstClassCallableNode $expr): string // phpcs:ignore
187+
protected function pPHPStan_Node_NullsafeFirstClassCallableNode(NullsafeMethodCallOnFirstClassCallableNode $expr): string // phpcs:ignore
188188
{
189189
return sprintf('__phpstanNullsafeFirstClassCallable(%s)', $this->p($expr->getOriginalNode()));
190190
}

src/Rules/Methods/NullsafeFirstClassCallableRule.php renamed to src/Rules/Methods/NullsafeMethodCallOnFirstClassCallableRule.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
use PhpParser\Node;
66
use PHPStan\Analyser\Scope;
77
use PHPStan\DependencyInjection\RegisteredRule;
8-
use PHPStan\Node\NullsafeFirstClassCallableNode;
8+
use PHPStan\Node\NullsafeMethodCallOnFirstClassCallableNode;
99
use PHPStan\Rules\Rule;
1010
use PHPStan\Rules\RuleErrorBuilder;
1111

1212
/**
13-
* @implements Rule<NullsafeFirstClassCallableNode>
13+
* @implements Rule<NullsafeMethodCallOnFirstClassCallableNode>
1414
*/
1515
#[RegisteredRule(level: 0)]
16-
final class NullsafeFirstClassCallableRule implements Rule
16+
final class NullsafeMethodCallOnFirstClassCallableRule implements Rule
1717
{
1818

1919
public function getNodeType(): string
2020
{
21-
return NullsafeFirstClassCallableNode::class;
21+
return NullsafeMethodCallOnFirstClassCallableNode::class;
2222
}
2323

2424
public function processNode(Node $node, Scope $scope): array

tests/PHPStan/Rules/Methods/NullsafeFirstClassCallableRuleTest.php renamed to tests/PHPStan/Rules/Methods/NullsafeMethodCallOnFirstClassCallableRuleTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
use PHPUnit\Framework\Attributes\RequiresPhp;
88

99
/**
10-
* @extends RuleTestCase<NullsafeFirstClassCallableRule>
10+
* @extends RuleTestCase<NullsafeMethodCallOnFirstClassCallableRule>
1111
*/
12-
class NullsafeFirstClassCallableRuleTest extends RuleTestCase
12+
class NullsafeMethodCallOnFirstClassCallableRuleTest extends RuleTestCase
1313
{
1414

1515
protected function getRule(): Rule
1616
{
17-
return new NullsafeFirstClassCallableRule();
17+
return new NullsafeMethodCallOnFirstClassCallableRule();
1818
}
1919

2020
#[RequiresPhp('>= 8.1.0')]

0 commit comments

Comments
 (0)