Skip to content

Commit e1bd062

Browse files
committed
Updated Rector to commit 5d9686f10fddfd44879702f52d81db64cd440ae5
rectorphp/rector-src@5d9686f [CodingStyle] Remove AstResolver usage on ArrowFunctionAndClosureFirstClassCallableGuard (#8031)
1 parent 14e638c commit e1bd062

2 files changed

Lines changed: 16 additions & 13 deletions

File tree

rules/CodingStyle/Guard/ArrowFunctionAndClosureFirstClassCallableGuard.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@
1212
use PhpParser\Node\Expr\MethodCall;
1313
use PhpParser\Node\Expr\StaticCall;
1414
use PhpParser\Node\Expr\Variable;
15-
use PhpParser\Node\FunctionLike;
1615
use PhpParser\Node\Identifier;
1716
use PhpParser\Node\Param;
1817
use PhpParser\NodeVisitor;
1918
use PHPStan\Analyser\Scope;
19+
use PHPStan\Reflection\FunctionReflection;
2020
use PHPStan\Reflection\MethodReflection;
2121
use Rector\NodeNameResolver\NodeNameResolver;
2222
use Rector\NodeTypeResolver\Node\AttributeKey;
2323
use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
2424
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
25-
use Rector\PhpParser\AstResolver;
2625
use Rector\PhpParser\Comparing\NodeComparator;
2726
use Rector\Reflection\ReflectionResolver;
2827
final class ArrowFunctionAndClosureFirstClassCallableGuard
@@ -31,10 +30,6 @@ final class ArrowFunctionAndClosureFirstClassCallableGuard
3130
* @readonly
3231
*/
3332
private ReflectionResolver $reflectionResolver;
34-
/**
35-
* @readonly
36-
*/
37-
private AstResolver $astResolver;
3833
/**
3934
* @readonly
4035
*/
@@ -43,10 +38,9 @@ final class ArrowFunctionAndClosureFirstClassCallableGuard
4338
* @readonly
4439
*/
4540
private NodeNameResolver $nodeNameResolver;
46-
public function __construct(ReflectionResolver $reflectionResolver, AstResolver $astResolver, NodeComparator $nodeComparator, NodeNameResolver $nodeNameResolver)
41+
public function __construct(ReflectionResolver $reflectionResolver, NodeComparator $nodeComparator, NodeNameResolver $nodeNameResolver)
4742
{
4843
$this->reflectionResolver = $reflectionResolver;
49-
$this->astResolver = $astResolver;
5044
$this->nodeComparator = $nodeComparator;
5145
$this->nodeNameResolver = $nodeNameResolver;
5246
}
@@ -105,11 +99,20 @@ public function shouldSkip($arrowFunctionOrClosure, $callLike, Scope $scope): bo
10599
return \true;
106100
}
107101
}
108-
$functionLike = $this->astResolver->resolveClassMethodOrFunctionFromCall($callLike);
109-
if (!$functionLike instanceof FunctionLike) {
102+
if ($this->isBuiltinReflection($reflection)) {
110103
return \false;
111104
}
112-
return count($functionLike->getParams()) > 1;
105+
return count($parameters) > 1;
106+
}
107+
/**
108+
* @param \PHPStan\Reflection\FunctionReflection|\PHPStan\Reflection\MethodReflection $reflection
109+
*/
110+
private function isBuiltinReflection($reflection): bool
111+
{
112+
if ($reflection instanceof FunctionReflection) {
113+
return $reflection->isBuiltin();
114+
}
115+
return $reflection->getDeclaringClass()->isBuiltin();
113116
}
114117
/**
115118
* @param Param[] $params

src/Application/VersionResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ final class VersionResolver
1919
* @api
2020
* @var string
2121
*/
22-
public const PACKAGE_VERSION = 'cce807554e4ccb1129dad7acf6f330deded9424c';
22+
public const PACKAGE_VERSION = '5d9686f10fddfd44879702f52d81db64cd440ae5';
2323
/**
2424
* @api
2525
* @var string
2626
*/
27-
public const RELEASE_DATE = '2026-06-11 10:12:37';
27+
public const RELEASE_DATE = '2026-06-11 10:14:05';
2828
/**
2929
* @var int
3030
*/

0 commit comments

Comments
 (0)