From 5ca50de6b71a5d2dec77f2adcf4fa2712be7132c Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sat, 11 May 2024 18:18:48 +0000 Subject: [PATCH] Updated Rector to commit b18da7d458c2d240dd50682b31670e134f2b1ed3 https://github.com/rectorphp/rector-src/commit/b18da7d458c2d240dd50682b31670e134f2b1ed3 [CodeQuality] Skip on property and class const on CallableThisArrayToAnonymousFunctionRector (#5869) --- .../CallableThisArrayToAnonymousFunctionRector.php | 13 ++++++++++--- src/Application/VersionResolver.php | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php b/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php index eb2fd342fac..f8183ae10f1 100644 --- a/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php +++ b/rules/CodeQuality/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php @@ -5,6 +5,9 @@ namespace Rector\CodeQuality\Rector\Array_; use PhpParser\Node; use PhpParser\Node\Expr\Array_; +use PhpParser\Node\Stmt\ClassConst; +use PhpParser\Node\Stmt\Property; +use PhpParser\NodeTraverser; use PHPStan\Analyser\Scope; use PHPStan\Reflection\Php\PhpMethodReflection; use Rector\NodeCollector\NodeAnalyzer\ArrayCallableMethodMatcher; @@ -89,13 +92,17 @@ CODE_SAMPLE */ public function getNodeTypes() : array { - return [Array_::class]; + return [Property::class, ClassConst::class, Array_::class]; } /** - * @param Array_ $node + * @param Property|ClassConst|Array_ $node + * @return null|int|\PhpParser\Node */ - public function refactorWithScope(Node $node, Scope $scope) : ?Node + public function refactorWithScope(Node $node, Scope $scope) { + if ($node instanceof Property || $node instanceof ClassConst) { + return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN; + } if ($this->shouldSkipTwigExtension($scope)) { return null; } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 9997b9df99a..9a59d4b5bd3 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = 'ca2988edc997d76a1d7d4b2c6a4f7226478cac7c'; + public const PACKAGE_VERSION = 'b18da7d458c2d240dd50682b31670e134f2b1ed3'; /** * @api * @var string */ - public const RELEASE_DATE = '2024-05-10 16:36:07'; + public const RELEASE_DATE = '2024-05-12 01:14:59'; /** * @var int */