[PHPStanStaticTypeMapper] Avoid double \ prefix on IntersectionTypeMa…

…pper (#5656) * [PHPStanStaticTypeMapper] Avoid double \ prefix on IntersectionTypeMapper * [PHPStanStaticTypeMapper] Avoid double \ prefix on IntersectionTypeMapper * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
rectorphp · Feb 22, 2024 · fb312e0 · fb312e0
1 parent 18a8aec
commit fb312e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php b/rules/Renaming/Rector/FunctionLike/RenameFunctionLikeParamWithinCallLikeArgRector.php
@@ -188,12 +188,10 @@ private function findArgFromMethodCall(
         CallLike $callLike
     ): ?Arg {
         if (is_int($renameFunctionLikeParamWithinCallLikeArg->getCallLikePosition())) {
-            $arg = $this->processPositionalArg($callLike, $renameFunctionLikeParamWithinCallLikeArg);
-        } else {
-            $arg = $this->processNamedArg($callLike, $renameFunctionLikeParamWithinCallLikeArg);
+            return $this->processPositionalArg($callLike, $renameFunctionLikeParamWithinCallLikeArg);
         }
 
-        return $arg;
+        return $this->processNamedArg($callLike, $renameFunctionLikeParamWithinCallLikeArg);
     }
 
     private function processPositionalArg(

diff --git a/src/BetterPhpDocParser/ValueObject/Type/FullyQualifiedIdentifierTypeNode.php b/src/BetterPhpDocParser/ValueObject/Type/FullyQualifiedIdentifierTypeNode.php
@@ -11,6 +11,6 @@ final class FullyQualifiedIdentifierTypeNode extends IdentifierTypeNode implemen
 {
     public function __toString(): string
     {
-        return '\\' . $this->name;
+        return '\\' . ltrim($this->name, '\\');
     }
 }
diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/IntersectionTypeMapper.php
@@ -48,7 +48,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type): TypeNode
             '',
             static function (AstNode $astNode): ?IdentifierTypeNode {
                 if ($astNode instanceof IdentifierTypeNode) {
-                    $astNode->name = '\\' . $astNode->name;
+                    $astNode->name = '\\' . ltrim($astNode->name, '\\');
                     return $astNode;
                 }