Fix #1768

* Correctly handle all current and future string types
* fix non-empty-array not correctly set as native type but set with hyphens

Author: kkmuffme

SlevomatCodingStandard/Helpers/AnnotationTypeHelper.php

@@ -307,14 +307,17 @@ public static function getTypeHintFromOneType(
 				return 'int';
 			}
 
-			if (in_array(
-				strtolower($typeNode->name),
-				['class-string', 'trait-string', 'callable-string', 'numeric-string', 'non-empty-string', 'non-falsy-string', 'literal-string'],
-				true,
-			)) {
+			// 'class-string', 'trait-string', 'callable-string', 'numeric-string', 'non-empty-string', 'non-falsy-string', 'literal-string',...
+			// see https://psalm.dev/docs/annotating_code/type_syntax/scalar_types/#class-string-interface-string
+			if (preg_match('/-string$/', strtolower($typeNode->name))) {
 				return 'string';
 			}
 
+			// here when used literally, e.g. non-empty-array|null
+			if (in_array(strtolower($typeNode->name), ['non-empty-array', 'list', 'non-empty-list'], true)) {
+				return 'array';
+			}
+
 			return $typeNode->name;
 		}
 

tests/Helpers/TypeHintHelperTest.php

@@ -379,6 +379,8 @@ public static function dataTypeHintEqualsAnnotation(): array
 		return [
 			['scalar', true],
 			['unionIsNotIntersection', false],
+			['fooFunctionWithReturnAnnotationComplexString', true],
+			['fooFunctionWithReturnAnnotationSimpleHyphenedIterable', true],
 		];
 	}
 

tests/Helpers/data/typeHintEqualsAnnotation.php

@@ -14,3 +14,19 @@ function scalar(): int|bool|float|string
 function unionIsNotIntersection(): Foo|Bar
 {
 }
+
+/**
+ * @return non-empty-lowercase-string
+ */
+function fooFunctionWithReturnAnnotationComplexString(): string
+{
+
+}
+
+/**
+ * @return non-empty-array|null
+ */
+function fooFunctionWithReturnAnnotationSimpleHyphenedIterable(): ?array
+{
+
+}