fix: prevent docblocks incorrectly being treated as one docblock.

If a docblock contains only a tag with no content, the `DocblockFormat` sniff will incorrectly uses the next function's docblock as part of the current docblock, essentially treating 2 docblocks as one. This then falsely flags the tag as having a `TagSpacing` violation.

To fix, we just need to implement boundary limits to ensure the content is only parsed in the current docblock before the closing comment tag.

- Fixed `checkTagSpacing` method in `DocblockFormatSniff` class to properly define and check docblock boundaries.

- Added new test functions in both `TestFile`s to ensure this doesn't get flagged.

Author: yCodeTech

test_utils/TestFile.php

@@ -217,6 +217,24 @@ public function testReturnEmptyLine()
         return "Hello World";
     }
 
+    /**
+     * Function with an @ tag that has no content, with another function's docblock below it.
+     *
+     * The `testTagWithNoContentContinued` function's docblock below should
+     * not be considered as part of the `@param` in the docblock below
+     * (should NOT be flagged for incorrect `TagSpacing`).
+     *
+     * @param
+     */
+    public function testTagWithNoContent() {
+    }
+
+    /**
+	 * Test function continued from above (should NOT be flagged for incorrect `TagSpacing`).
+	 */
+    public function testTagWithNoContentContinued() {
+    }
+
 
     /*************************
      * MISSING @RETURN TESTS *

test_utils/TestFile_WithErrors_DoNotFix.php

@@ -217,6 +217,24 @@ public function testReturnEmptyLine()
         return "Hello World";
     }
 
+    /**
+     * Function with an @ tag that has no content, with another function's docblock below it.
+     *
+     * The `testTagWithNoContentContinued` function's docblock below should
+     * not be considered as part of the `@param` in the docblock below
+     * (should NOT be flagged for incorrect `TagSpacing`).
+     *
+     * @param
+     */
+    public function testTagWithNoContent() {
+    }
+
+    /**
+	 * Test function continued from above (should NOT be flagged for incorrect `TagSpacing`).
+	 */
+    public function testTagWithNoContentContinued() {
+    }
+
 
     /*************************
      * MISSING @RETURN TESTS *

yCodeTech/Sniffs/Commenting/DocblockFormatSniff.php

@@ -155,8 +155,14 @@ private function checkTagSpacing(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        // Check spacing between @ tag and its content
-        $next = $phpcsFile->findNext([T_DOC_COMMENT_WHITESPACE, T_DOC_COMMENT_STRING], ($stackPtr + 1));
+        // Find the docblock boundaries to ensure we don't go beyond the current docblock
+        $docBlockEnd = $phpcsFile->findNext([T_DOC_COMMENT_CLOSE_TAG], ($stackPtr + 1));
+        if ($docBlockEnd === false) {
+            return;
+        }
+
+        // Check spacing between @ tag and its content (within same docblock only)
+        $next = $phpcsFile->findNext([T_DOC_COMMENT_WHITESPACE, T_DOC_COMMENT_STRING], ($stackPtr + 1), $docBlockEnd);
         if ($next === false) {
             return;
         }
@@ -173,9 +179,9 @@ private function checkTagSpacing(File $phpcsFile, $stackPtr)
             if ($whitespaceContent !== ' ') {
                 $needsFixing = true;
             }
-            
-            // Move to next token which should be the string
-            $contentToken = $phpcsFile->findNext(T_DOC_COMMENT_STRING, ($next + 1));
+
+            // Move to next token which should be the string (within same docblock)
+            $contentToken = $phpcsFile->findNext(T_DOC_COMMENT_STRING, ($next + 1), $docBlockEnd);
             if ($contentToken === false) {
                 return;
             }