Type aliases cannot be used internally because they might clash with an existing class name

ondrejmirtes · ondrejmirtes · commit 4d082805aeca · 2020-07-05T09:00:32.000+02:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -64,9 +64,7 @@ parameters:
 		nodesByStringCountMax: 512
 	reportUnmatchedIgnoredErrors: true
 	scopeClass: PHPStan\Analyser\MutatingScope
-	typeAliases:
-		scalar: 'int|float|string|bool'
-		number: 'int|float'
+	typeAliases: []
 	universalObjectCratesClasses:
 		- stdClass
 	stubFiles:
diff --git a/src/PhpDoc/TypeNodeResolver.php b/src/PhpDoc/TypeNodeResolver.php
@@ -59,6 +59,7 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeWithClassName;
+use PHPStan\Type\UnionType;
 use PHPStan\Type\VoidType;
 
 class TypeNodeResolver
@@ -135,6 +136,12 @@ private function resolveIdentifierTypeNode(IdentifierTypeNode $typeNode, NameSco
 			case 'array-key':
 				return new BenevolentUnionType([new IntegerType(), new StringType()]);
 
+			case 'scalar':
+				return new UnionType([new IntegerType(), new FloatType(), new StringType(), new BooleanType()]);
+
+			case 'number':
+				return new UnionType([new IntegerType(), new FloatType()]);
+
 			case 'bool':
 			case 'boolean':
 				return new BooleanType();
