keep TypehintHelper remove null

samsonasik · samsonasik · commit 4e820816ad78 · 2025-05-03T16:24:12.000+07:00
diff --git a/src/Type/TypehintHelper.php b/src/Type/TypehintHelper.php
@@ -68,8 +68,6 @@ public static function decideTypeFromReflection(
 		$type = ParserNodeTypeToPHPStanType::resolve($typeNode, $selfClass);
 		if ($reflectionType->allowsNull()) {
 			$type = TypeCombinator::addNull($type);
-		} elseif ($phpDocType !== null) {
-			$phpDocType = TypeCombinator::removeNull($phpDocType);
 		}
 
 		return self::decideType($type, $phpDocType);
@@ -80,6 +78,10 @@ public static function decideType(
 		?Type $phpDocType,
 	): Type
 	{
+		if ($phpDocType !== null && $type->isNull()->no()) {
+			$phpDocType = TypeCombinator::removeNull($phpDocType);
+		}
+
 		if ($type instanceof BenevolentUnionType) {
 			return $type;
 		}

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ public static function decideTypeFromReflection(`
`68`	`68`	`$type = ParserNodeTypeToPHPStanType::resolve($typeNode, $selfClass);`
`69`	`69`	`if ($reflectionType->allowsNull()) {`
`70`	`70`	`$type = TypeCombinator::addNull($type);`
`71`		`- } elseif ($phpDocType !== null) {`
`72`		`- $phpDocType = TypeCombinator::removeNull($phpDocType);`
`73`	`71`	`}`
`74`	`72`
`75`	`73`	`return self::decideType($type, $phpDocType);`
`@@ -80,6 +78,10 @@ public static function decideType(`
`80`	`78`	`?Type $phpDocType,`
`81`	`79`	`): Type`
`82`	`80`	`{`
	`81`	`+ if ($phpDocType !== null && $type->isNull()->no()) {`
	`82`	`+ $phpDocType = TypeCombinator::removeNull($phpDocType);`
	`83`	`+ }`
	`84`	`+`
`83`	`85`	`if ($type instanceof BenevolentUnionType) {`
`84`	`86`	`return $type;`
`85`	`87`	`}`