Fixed DocCommentHelper::findDocCommentOwnerPointer()

Author: kukulich

SlevomatCodingStandard/Helpers/DocCommentHelper.php

@@ -14,9 +14,7 @@
 use function stripos;
 use function strtolower;
 use function trim;
-use const T_ABSTRACT;
 use const T_ATTRIBUTE;
-use const T_CLASS;
 use const T_CLOSE_CURLY_BRACKET;
 use const T_CONST;
 use const T_DOC_COMMENT_CLOSE_TAG;
@@ -25,21 +23,10 @@
 use const T_DOC_COMMENT_STRING;
 use const T_DOC_COMMENT_TAG;
 use const T_DOC_COMMENT_WHITESPACE;
-use const T_ENUM;
-use const T_FINAL;
 use const T_FUNCTION;
-use const T_INTERFACE;
 use const T_OPEN_CURLY_BRACKET;
-use const T_PRIVATE;
-use const T_PROTECTED;
-use const T_PUBLIC;
-use const T_READONLY;
 use const T_SEMICOLON;
-use const T_STATIC;
-use const T_TRAIT;
-use const T_VAR;
 use const T_VARIABLE;
-use const T_WHITESPACE;
 
 /**
  * @internal
@@ -183,38 +170,36 @@ public static function findDocCommentOwnerPointer(File $phpcsFile, int $docComme
 	{
 		$tokens = $phpcsFile->getTokens();
 
-		$docCommentCloserPointer = $tokens[$docCommentOpenPointer]['comment_closer'];
-
 		if (self::isInline($phpcsFile, $docCommentOpenPointer)) {
 			return null;
 		}
 
 		$docCommentOwnerPointer = null;
 
-		for ($i = $docCommentCloserPointer + 1; $i < count($tokens); $i++) {
-			if ($tokens[$i]['code'] === T_ATTRIBUTE) {
-				$i = $tokens[$i]['attribute_closer'];
-				continue;
+		$i = $docCommentOpenPointer;
+		do {
+			$pointer = TokenHelper::findNext(
+				$phpcsFile,
+				[T_ATTRIBUTE, T_DOC_COMMENT_OPEN_TAG, T_FUNCTION, T_VARIABLE, T_CONST, ...TokenHelper::CLASS_TYPE_TOKEN_CODES],
+				$i + 1,
+			);
+			if ($pointer === null) {
+				break;
 			}
 
-			if (in_array(
-				$tokens[$i]['code'],
-				[T_PUBLIC, T_PROTECTED, T_PRIVATE, T_VAR, T_READONLY, T_FINAL, T_STATIC, T_ABSTRACT, T_WHITESPACE],
-				true,
-			)) {
-				continue;
+			if ($tokens[$pointer]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+				return null;
 			}
 
-			if (in_array(
-				$tokens[$i]['code'],
-				[T_FUNCTION, T_VARIABLE, T_CONST, ...TokenHelper::CLASS_TYPE_TOKEN_CODES],
-				true,
-			)) {
-				$docCommentOwnerPointer = $i;
+			if ($tokens[$pointer]['code'] === T_ATTRIBUTE) {
+				$i = $tokens[$pointer]['attribute_closer'];
+				continue;
 			}
 
+			$docCommentOwnerPointer = $pointer;
 			break;
-		}
+
+		} while (true);
 
 		return $docCommentOwnerPointer;
 	}
@@ -229,7 +214,7 @@ public static function isInline(File $phpcsFile, int $docCommentOpenPointer): bo
 			$nextPointer !== null
 			&& in_array(
 				$tokens[$nextPointer]['code'],
-				[T_PUBLIC, T_PROTECTED, T_PRIVATE, T_READONLY, T_FINAL, T_STATIC, T_ABSTRACT, T_CONST, T_CLASS, T_INTERFACE, T_TRAIT, T_ENUM, T_ATTRIBUTE],
+				[...TokenHelper::MODIFIERS_TOKEN_CODES, ...TokenHelper::CLASS_TYPE_TOKEN_CODES, T_ATTRIBUTE],
 				true,
 			)
 		) {

tests/Helpers/DocCommentHelperTest.php

@@ -4,6 +4,7 @@
 
 use PHP_CodeSniffer\Files\File;
 use function array_map;
+use function sprintf;
 use const T_DOC_COMMENT_OPEN_TAG;
 
 class DocCommentHelperTest extends TestCase
@@ -377,9 +378,10 @@ public function testIsInline(): void
 	{
 		$phpcsFile = $this->getTestedCodeSnifferFile();
 
-		foreach ([3, 10, 18, 32, 46, 51, 76, 99] as $line) {
+		foreach ([3, 10, 32, 46, 51, 76, 99] as $line) {
 			self::assertFalse(
 				DocCommentHelper::isInline($phpcsFile, $this->findPointerByLineAndType($phpcsFile, $line, T_DOC_COMMENT_OPEN_TAG)),
+				sprintf('Failed asserting that doc comment on line %d is not inline.', $line),
 			);
 		}
 

tests/Sniffs/TypeHints/data/disallowMixedTypeHintNoErrors.php

@@ -1,4 +1,4 @@
-<?php
+<?php // lint >= 8.5
 
 /**
  * @see mixed
@@ -32,11 +32,25 @@ public function foo(array $mixed)
 		return $mixed === true;
 	}
 
+	protected array $property;
+
+	public readonly array $data;
+
 }
 
 class WhateverOverridden extends Whatever
 {
 
+	/**
+	 * @var array<mixed>
+	 */
+	#[Override]
+	protected array $property;
+
+	/** @var array<string, mixed> */
+	#[Override]
+	public readonly array $data;
+
 	/**
 	 * @var array<mixed>
 	 */