ensure pointed to target key (#5278)

rectorphp · Nov 23, 2023 · 26f3570 · 26f3570
1 parent 944d5fb
commit 26f3570
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php b/packages/BetterPhpDocParser/PhpDocParser/DoctrineAnnotationDecorator.php
@@ -269,20 +269,20 @@ private function processDescriptionAsSpacelessPhpDoctagNode(
             return $key;
         }
 
-        $unsetKey = $phpDocNode->children[$key] instanceof SpacelessPhpDocTagNode
-            ? $key + count($spacelessPhpDocTagNodes)
-            : $key;
+        while (isset($phpDocNode->children[$key]) && $phpDocNode->children[$key] !== $phpDocTagNode) {
+            ++$key;
+        }
 
-        unset($phpDocNode->children[$unsetKey]);
+        unset($phpDocNode->children[$key]);
 
         $classNode = new PhpDocTagNode($phpDocTagNode->name, $phpDocTagNode->value);
         $description = Strings::replace($description, self::LONG_ANNOTATION_REGEX, '');
         $description = substr($description, 0, -7);
 
         $phpDocTagNode->value->description = $description;
-        $phpDocNode->children[$unsetKey] = $classNode;
+        $phpDocNode->children[$key] = $classNode;
 
-        array_splice($phpDocNode->children, $unsetKey + 1, 0, $spacelessPhpDocTagNodes);
+        array_splice($phpDocNode->children, $key + 1, 0, $spacelessPhpDocTagNodes);
 
         return $key + count($spacelessPhpDocTagNodes);
     }