Improved AnnotationTypeHelper::export() for callable in array

Author: kukulich

SlevomatCodingStandard/Helpers/AnnotationTypeHelper.php

@@ -23,6 +23,7 @@
 use function count;
 use function in_array;
 use function preg_replace;
+use function sprintf;
 use function strtolower;
 use function substr;
 
@@ -273,6 +274,10 @@ public static function export(TypeNode $typeNode): string
 			$exportedTypeNode = substr($exportedTypeNode, 1, -1);
 		}
 
+		if ($typeNode instanceof ArrayTypeNode && $typeNode->type instanceof CallableTypeNode) {
+			$exportedTypeNode = sprintf('(%s)[]', substr($exportedTypeNode, 0, -2));
+		}
+
 		return $exportedTypeNode;
 	}
 

tests/Sniffs/Namespaces/ReferenceUsedNamesOnlySniffTest.php

@@ -727,7 +727,7 @@ public function testSearchingInAnnotations(): void
 			]
 		);
 
-		self::assertSame(31, $report->getErrorCount());
+		self::assertSame(32, $report->getErrorCount());
 
 		self::assertSniffError(
 			$report,
@@ -918,6 +918,13 @@ public function testSearchingInAnnotations(): void
 
 		self::assertNoSniffError($report, 138);
 
+		self::assertSniffError(
+			$report,
+			145,
+			ReferenceUsedNamesOnlySniff::CODE_REFERENCE_VIA_FULLY_QUALIFIED_NAME,
+			'Class \Foo\Anything should not be referenced via a fully qualified name, but via a use statement.'
+		);
+
 		self::assertAllFixedInFile($report);
 	}
 

tests/Sniffs/Namespaces/data/shouldBeInUseStatementSearchingInAnnotations.fixed.php

@@ -143,3 +143,9 @@ class Whatever
 	private $anythingDifferent;
 
 }
+
+class CallableInArray
+{
+	/** @var (callable(): Anything)[] */
+	private array $callableInArray;
+}

tests/Sniffs/Namespaces/data/shouldBeInUseStatementSearchingInAnnotations.php

@@ -139,3 +139,9 @@ class Whatever
 	private $anythingDifferent;
 
 }
+
+class CallableInArray
+{
+	/** @var (callable(): \Foo\Anything)[] */
+	private array $callableInArray;
+}