From 18598452eaf98934840766394824598a80cb57ce Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 4 Sep 2025 14:15:55 +0700 Subject: [PATCH 1/3] [AutoImport] Skip different namespaced function on auto import + RenameFunctionRector --- .../Fixture/skip_different_namespaced_function.php.inc | 9 +++++++++ tests/Issues/AutoImport/config/configured_rule.php | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc diff --git a/tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc b/tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc new file mode 100644 index 00000000000..80c224ecdbe --- /dev/null +++ b/tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc @@ -0,0 +1,9 @@ +rules([ConsoleExecuteReturnIntRector::class, RemoveUnusedPrivatePropertyRector::class]); + $rectorConfig->ruleWithConfiguration(RenameFunctionRector::class, [ + 'split' => 'explode', + ]); }; From 7b5c29d9e4a050ce7f1530be8e6555a7ac5adf16 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 4 Sep 2025 15:05:26 +0700 Subject: [PATCH 2/3] update fixture --- ...name_different_namespaced_function.php.inc | 25 +++++++++++++++++++ ...skip_different_namespaced_function.php.inc | 9 ------- 2 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc delete mode 100644 tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc diff --git a/tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc b/tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc new file mode 100644 index 00000000000..6e716cc9e0a --- /dev/null +++ b/tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc @@ -0,0 +1,25 @@ + +----- + \ No newline at end of file diff --git a/tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc b/tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc deleted file mode 100644 index 80c224ecdbe..00000000000 --- a/tests/Issues/AutoImport/Fixture/skip_different_namespaced_function.php.inc +++ /dev/null @@ -1,9 +0,0 @@ - Date: Thu, 4 Sep 2025 15:07:47 +0700 Subject: [PATCH 3/3] Fix --- .../NodeNameResolver/FuncCallNameResolver.php | 4 ++++ .../do_not_rename_different_namespaced_function.php.inc | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php b/src/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php index d9802fa779f..19b95dac056 100644 --- a/src/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php +++ b/src/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php @@ -49,6 +49,10 @@ public function resolve(Node $node, ?Scope $scope): ?string } } + if (is_string($namespaceName)) { + return $namespaceName; + } + return (string) $node->name; } } diff --git a/tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc b/tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc index 6e716cc9e0a..96ca045cb02 100644 --- a/tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc +++ b/tests/Issues/AutoImport/Fixture/do_not_rename_different_namespaced_function.php.inc @@ -12,7 +12,7 @@ final class DontRenameDifferentNamespacedFunction ----- \ No newline at end of file