Skip to content

Commit c99cce3

Browse files
authored
Fix no change handling (#7306)
1 parent d232aac commit c99cce3

1 file changed

Lines changed: 23 additions & 1 deletion

File tree

rules/CodingStyle/Node/NameImporter.php

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,29 @@ private function importNameAndCollectNewUseStatement(
108108
}
109109

110110
$this->addUseImport($file, $fullyQualified, $fullyQualifiedObjectType);
111-
return $fullyQualifiedObjectType->getShortNameNode();
111+
$name = $fullyQualifiedObjectType->getShortNameNode();
112+
113+
$oldTokens = $file->getOldTokens();
114+
$startTokenPos = $fullyQualified->getStartTokenPos();
115+
116+
if (! isset($oldTokens[$startTokenPos])) {
117+
return $name;
118+
}
119+
120+
$tokenShortName = $oldTokens[$startTokenPos];
121+
if (str_starts_with($tokenShortName->text, '\\')) {
122+
return $name;
123+
}
124+
125+
if (str_contains($tokenShortName->text, '\\')) {
126+
return $name;
127+
}
128+
129+
if ($name->toString() !== $tokenShortName->text) {
130+
return $name;
131+
}
132+
133+
return null;
112134
}
113135

114136
private function addUseImport(

0 commit comments

Comments
 (0)