DisallowArrayTypeHintSyntaxSniff: Fixed internal error

Author: kukulich

SlevomatCodingStandard/Sniffs/TypeHints/DisallowArrayTypeHintSyntaxSniff.php

@@ -172,7 +172,11 @@ private function findGenericIdentifier(File $phpcsFile, TypeNode $typeNode, Anno
 				return null;
 			}
 
-			$functionPointer = TokenHelper::findNext($phpcsFile, T_FUNCTION, $annotation->getStartPointer() + 1);
+			$functionPointer = TokenHelper::findNext($phpcsFile, TokenHelper::$functionTokenCodes, $annotation->getStartPointer() + 1);
+
+			if ($functionPointer === null || $phpcsFile->getTokens()[$functionPointer]['code'] !== T_FUNCTION) {
+				return null;
+			}
 
 			if ($annotation instanceof ParameterAnnotation) {
 				$parameterTypeHints = FunctionHelper::getParametersTypeHints($phpcsFile, $functionPointer);

tests/Sniffs/TypeHints/DisallowArrayTypeHintSyntaxSniffTest.php

@@ -21,7 +21,7 @@ public function testErrors(): void
 			],
 		]);
 
-		self::assertSame(23, $report->getErrorCount());
+		self::assertSame(25, $report->getErrorCount());
 
 		self::assertSniffError($report, 6, DisallowArrayTypeHintSyntaxSniff::CODE_DISALLOWED_ARRAY_TYPE_HINT_SYNTAX, 'Usage of array type hint syntax in "\DateTimeImmutable[]" is disallowed, use generic type hint syntax instead.');
 		self::assertSniffError($report, 7, DisallowArrayTypeHintSyntaxSniff::CODE_DISALLOWED_ARRAY_TYPE_HINT_SYNTAX, 'Usage of array type hint syntax in "bool[]" is disallowed, use generic type hint syntax instead.');
@@ -46,6 +46,8 @@ public function testErrors(): void
 		self::assertSniffError($report, 60, DisallowArrayTypeHintSyntaxSniff::CODE_DISALLOWED_ARRAY_TYPE_HINT_SYNTAX, 'Usage of array type hint syntax in "string[][]" is disallowed, use generic type hint syntax instead.');
 		self::assertSniffError($report, 65, DisallowArrayTypeHintSyntaxSniff::CODE_DISALLOWED_ARRAY_TYPE_HINT_SYNTAX, 'Usage of array type hint syntax in "string[][]" is disallowed, use generic type hint syntax instead.');
 		self::assertSniffError($report, 70, DisallowArrayTypeHintSyntaxSniff::CODE_DISALLOWED_ARRAY_TYPE_HINT_SYNTAX, 'Usage of array type hint syntax in "int[]" is disallowed, use generic type hint syntax instead.');
+		self::assertSniffError($report, 78, DisallowArrayTypeHintSyntaxSniff::CODE_DISALLOWED_ARRAY_TYPE_HINT_SYNTAX, 'Usage of array type hint syntax in "int[]" is disallowed, use generic type hint syntax instead.');
+		self::assertSniffError($report, 79, DisallowArrayTypeHintSyntaxSniff::CODE_DISALLOWED_ARRAY_TYPE_HINT_SYNTAX, 'Usage of array type hint syntax in "mixed[]" is disallowed, use generic type hint syntax instead.');
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/TypeHints/data/disallowArrayTypeHintSyntaxErrors.fixed.php

@@ -72,4 +72,13 @@ public function r($r)
 	{
 	}
 
+	private function s(): void
+	{
+		/**
+		 * @param array<int> $data
+		 * @return array<mixed>
+		 */
+		$closure = function (array $data): array {};
+	}
+
 }

tests/Sniffs/TypeHints/data/disallowArrayTypeHintSyntaxErrors.php

@@ -72,4 +72,13 @@ public function r($r)
 	{
 	}
 
+	private function s(): void
+	{
+		/**
+		 * @param int[] $data
+		 * @return mixed[]
+		 */
+		$closure = function (array $data): array {};
+	}
+
 }