Updated Rector to commit 8a7cd36365b2f05683f072309cd2484978d9e5b2

TomasVotruba · TomasVotruba · commit 9257029b8eea · 2024-06-20T15:37:24.000Z
rectorphp/rector-src@8a7cd36 [Renaming] Use continue 2 on RenameMethodRector after ClassMethod renamed on configured method call renames loop (#5989)
diff --git a/rules/Renaming/Rector/MethodCall/RenameMethodRector.php b/rules/Renaming/Rector/MethodCall/RenameMethodRector.php
@@ -151,11 +151,12 @@ private function refactorClass($classOrInterface, Scope $scope)
                 continue;
             }
             foreach ($this->methodCallRenames as $methodCallRename) {
-                if ($this->shouldSkipRename($methodName, $classMethod, $methodCallRename, $classReflection, $classOrInterface)) {
+                if ($this->shouldSkipRename($methodName, $classMethod, $methodCallRename, $classOrInterface, $classReflection)) {
                     continue;
                 }
                 $classMethod->name = new Identifier($methodCallRename->getNewMethod());
                 $hasChanged = \true;
+                continue 2;
             }
         }
         if ($hasChanged) {
@@ -166,7 +167,7 @@ private function refactorClass($classOrInterface, Scope $scope)
     /**
      * @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_ $classOrInterface
      */
-    private function shouldSkipRename(string $methodName, ClassMethod $classMethod, MethodCallRenameInterface $methodCallRename, ClassReflection $classReflection, $classOrInterface) : bool
+    private function shouldSkipRename(string $methodName, ClassMethod $classMethod, MethodCallRenameInterface $methodCallRename, $classOrInterface, ?ClassReflection $classReflection) : bool
     {
         if (!$this->nodeNameResolver->isStringName($methodName, $methodCallRename->getOldMethod())) {
             return \true;
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '2dda748541be13dac8ef328011bc50233f2030bc';
+    public const PACKAGE_VERSION = '8a7cd36365b2f05683f072309cd2484978d9e5b2';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-06-20 14:52:05';
+    public const RELEASE_DATE = '2024-06-20 22:34:06';
     /**
      * @var int
      */

Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,12 @@ private function refactorClass($classOrInterface, Scope $scope)`
`151`	`151`	`continue;`
`152`	`152`	`}`
`153`	`153`	`foreach ($this->methodCallRenames as $methodCallRename) {`
`154`		`- if ($this->shouldSkipRename($methodName, $classMethod, $methodCallRename, $classReflection, $classOrInterface)) {`
	`154`	`+ if ($this->shouldSkipRename($methodName, $classMethod, $methodCallRename, $classOrInterface, $classReflection)) {`
`155`	`155`	`continue;`
`156`	`156`	`}`
`157`	`157`	`$classMethod->name = new Identifier($methodCallRename->getNewMethod());`
`158`	`158`	`$hasChanged = \true;`
	`159`	`+ continue 2;`
`159`	`160`	`}`
`160`	`161`	`}`
`161`	`162`	`if ($hasChanged) {`
`@@ -166,7 +167,7 @@ private function refactorClass($classOrInterface, Scope $scope)`
`166`	`167`	`/**`
`167`	`168`	`* @param \PhpParser\Node\Stmt\Class_\|\PhpParser\Node\Stmt\Interface_ $classOrInterface`
`168`	`169`	`*/`
`169`		`- private function shouldSkipRename(string $methodName, ClassMethod $classMethod, MethodCallRenameInterface $methodCallRename, ClassReflection $classReflection, $classOrInterface) : bool`
	`170`	`+ private function shouldSkipRename(string $methodName, ClassMethod $classMethod, MethodCallRenameInterface $methodCallRename, $classOrInterface, ?ClassReflection $classReflection) : bool`
`170`	`171`	`{`
`171`	`172`	`if (!$this->nodeNameResolver->isStringName($methodName, $methodCallRename->getOldMethod())) {`
`172`	`173`	`return \true;`