Printer::printType() refactoring

dg · dg · commit 9afe1f025a82 · 2024-09-10T11:04:34.000+02:00
diff --git a/src/PhpGenerator/Printer.php b/src/PhpGenerator/Printer.php
@@ -401,13 +401,9 @@ protected function printType(?string $type, bool $nullable): string
 			$type = $this->namespace->simplifyType($type);
 		}
 
-		if ($nullable && strcasecmp($type, 'mixed')) {
-			$type = str_contains($type, '|')
-				? $type . '|null'
-				: '?' . $type;
-		}
-
-		return $type;
+		return $nullable
+			? Type::nullable($type)
+			: $type;
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -401,13 +401,9 @@ protected function printType(?string $type, bool $nullable): string`
`401`	`401`	`$type = $this->namespace->simplifyType($type);`
`402`	`402`	`}`
`403`	`403`
`404`		`- if ($nullable && strcasecmp($type, 'mixed')) {`
`405`		`- $type = str_contains($type, '\|')`
`406`		`- ? $type . '\|null'`
`407`		`- : '?' . $type;`
`408`		`- }`
`409`		`-`
`410`		`- return $type;`
	`404`	`+ return $nullable`
	`405`	`+ ? Type::nullable($type)`
	`406`	`+ : $type;`
`411`	`407`	`}`
`412`	`408`
`413`	`409`