Support "null" and "false" pseudotypes in native unions

jiripudil · ondrejmirtes · commit dbc8ee932d97 · 2020-12-07T14:32:59.000+01:00
diff --git a/src/Type/TypehintHelper.php b/src/Type/TypehintHelper.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Type;
 
 use PHPStan\Broker\Broker;
+use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Generic\TemplateTypeHelper;
 use ReflectionNamedType;
 use ReflectionType;
@@ -18,6 +19,8 @@ private static function getTypeObjectFromTypehint(string $typeString, ?string $s
 				return new IntegerType();
 			case 'bool':
 				return new BooleanType();
+			case 'false':
+				return new ConstantBooleanType(false);
 			case 'string':
 				return new StringType();
 			case 'float':
@@ -47,6 +50,8 @@ private static function getTypeObjectFromTypehint(string $typeString, ?string $s
 				return new NonexistentParentClassType();
 			case 'static':
 				return $selfClass !== null ? new StaticType($selfClass) : new ErrorType();
+			case 'null':
+				return new NullType();
 			default:
 				return new ObjectType($typeString);
 		}
@@ -85,6 +90,12 @@ public static function decideTypeFromReflection(
 		if (\Nette\Utils\Strings::endsWith(strtolower($reflectionTypeString), '\\mixed')) {
 			$reflectionTypeString = 'mixed';
 		}
+		if (\Nette\Utils\Strings::endsWith(strtolower($reflectionTypeString), '\\false')) {
+			$reflectionTypeString = 'false';
+		}
+		if (\Nette\Utils\Strings::endsWith(strtolower($reflectionTypeString), '\\null')) {
+			$reflectionTypeString = 'null';
+		}
 
 		$type = self::getTypeObjectFromTypehint($reflectionTypeString, $selfClass);
 		if ($reflectionType->allowsNull()) {
diff --git a/tests/PHPStan/Reflection/data/unionTypes.php b/tests/PHPStan/Reflection/data/unionTypes.php
@@ -78,4 +78,16 @@ public function doLorem(): array|false
 
 	}
 
+	public function doIpsum(int|string|null $nullable): void
+	{
+		assertType('int|null|string', $nullable);
+		assertNativeType('int|null|string', $nullable);
+		assertType('int|null|string', $this->doDolor());
+	}
+
+	public function doDolor(): int|string|null
+	{
+
+	}
+
 }
