rerun CI

Author: kkmuffme

SlevomatCodingStandard/Helpers/AnnotationTypeHelper.php

@@ -23,6 +23,7 @@
 use function count;
 use function in_array;
 use function strtolower;
+use function preg_match;
 
 /**
  * @internal
@@ -309,7 +310,7 @@ public static function getTypeHintFromOneType(
 
 			// '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))) {
+			if ((bool) preg_match('/-string$/', strtolower($typeNode->name))) {
 				return 'string';
 			}
 

SlevomatCodingStandard/Helpers/TypeHintHelper.php

@@ -13,6 +13,7 @@
 use function count;
 use function implode;
 use function in_array;
+use function preg_match;
 use function preg_split;
 use function sort;
 use function sprintf;
@@ -170,6 +171,7 @@ public static function isSimpleUnofficialTypeHints(string $typeHint): bool
 		static $simpleUnofficialTypeHints;
 
 		if ($simpleUnofficialTypeHints === null) {
+			// see https://psalm.dev/docs/annotating_code/type_syntax/atomic_types/
 			$simpleUnofficialTypeHints = [
 				'null',
 				'mixed',
@@ -180,15 +182,10 @@ public static function isSimpleUnofficialTypeHints(string $typeHint): bool
 				'resource',
 				'static',
 				'$this',
-				'class-string',
-				'trait-string',
-				'callable-string',
-				'numeric-string',
-				'non-empty-string',
-				'non-falsy-string',
-				'literal-string',
 				'array-key',
 				'list',
+				'non-empty-array',
+				'non-empty-list',
 				'empty',
 				'positive-int',
 				'negative-int',
@@ -197,7 +194,7 @@ public static function isSimpleUnofficialTypeHints(string $typeHint): bool
 			];
 		}
 
-		return in_array($typeHint, $simpleUnofficialTypeHints, true);
+		return in_array($typeHint, $simpleUnofficialTypeHints, true) || preg_match('/-string$/', $typeHint);
 	}
 
 	/**