Small TypeHintHelper refactoring

Author: kukulich

SlevomatCodingStandard/Helpers/TypeHintHelper.php

@@ -5,47 +5,14 @@
 class TypeHintHelper
 {
 
-	/** @var string[] */
-	public static $simpleTypeHints = [
-		'int',
-		'integer',
-		'float',
-		'string',
-		'bool',
-		'boolean',
-		'callable',
-		'self',
-		'array',
-		'iterable',
-		'void',
-	];
-
-	/** @var string[] */
-	public static $simpleIterableTypeHints = [
-		'array',
-		'iterable',
-	];
-
-	/** @var string[] */
-	public static $simpleUnofficialTypeHints = [
-		'null',
-		'mixed',
-		'true',
-		'false',
-		'resource',
-		'object',
-		'static',
-		'$this',
-	];
-
 	public static function isSimpleTypeHint(string $typeHint): bool
 	{
-		return in_array($typeHint, self::$simpleTypeHints, true);
+		return in_array($typeHint, self::getSimpleTypeHints(), true);
 	}
 
 	public static function isSimpleIterableTypeHint(string $typeHint): bool
 	{
-		return in_array($typeHint, self::$simpleIterableTypeHints, true);
+		return in_array($typeHint, self::getSimpleIterableTypeHints(), true);
 	}
 
 	public static function convertLongSimpleTypeHintToShort(string $typeHint): string
@@ -67,4 +34,52 @@ public static function getFullyQualifiedTypeHint(\PHP_CodeSniffer_File $phpcsFil
 		return NamespaceHelper::resolveName($phpcsFile, $typeHint, $useStatements, $pointer);
 	}
 
+	/**
+	 * @return string[]
+	 */
+	public static function getSimpleTypeHints(): array
+	{
+		return [
+			'int',
+			'integer',
+			'float',
+			'string',
+			'bool',
+			'boolean',
+			'callable',
+			'self',
+			'array',
+			'iterable',
+			'void',
+		];
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getSimpleIterableTypeHints(): array
+	{
+		return [
+			'array',
+			'iterable',
+		];
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public static function getSimpleUnofficialTypeHints(): array
+	{
+		return [
+			'null',
+			'mixed',
+			'true',
+			'false',
+			'resource',
+			'object',
+			'static',
+			'$this',
+		];
+	}
+
 }

SlevomatCodingStandard/Sniffs/Namespaces/FullyQualifiedClassNameInAnnotationSniff.php

@@ -51,7 +51,7 @@ public function process(\PHP_CodeSniffer_File $phpcsFile, $annotationTagPointer)
 		foreach ($typeHints as $typeHint) {
 			$typeHint = preg_replace('~(\[\])+$~', '', $typeHint);
 			$lowercasedTypeHint = strtolower($typeHint);
-			if (TypeHintHelper::isSimpleTypeHint($lowercasedTypeHint) || in_array($lowercasedTypeHint, TypeHintHelper::$simpleUnofficialTypeHints, true)) {
+			if (TypeHintHelper::isSimpleTypeHint($lowercasedTypeHint) || in_array($lowercasedTypeHint, TypeHintHelper::getSimpleUnofficialTypeHints(), true)) {
 				continue;
 			}
 

SlevomatCodingStandard/Sniffs/TypeHints/TypeHintDeclarationSniff.php

@@ -719,7 +719,7 @@ private function getSniffName(string $sniffName): string
 
 	private function isValidTypeHint(string $typeHint): bool
 	{
-		return TypeHintHelper::isSimpleTypeHint($typeHint) || !in_array($typeHint, TypeHintHelper::$simpleUnofficialTypeHints, true);
+		return TypeHintHelper::isSimpleTypeHint($typeHint) || !in_array($typeHint, TypeHintHelper::getSimpleUnofficialTypeHints(), true);
 	}
 
 	private function definitionContainsNullTypeHint(string $typeHintDefinition): bool