Printer::printType() refactoring

dg · dg · commit c125c359db4d · 2024-06-18T22:55:19.000+02:00
diff --git a/src/PhpGenerator/Printer.php b/src/PhpGenerator/Printer.php
@@ -402,13 +402,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
`@@ -402,13 +402,9 @@ protected function printType(?string $type, bool $nullable): string`
`402`	`402`	`$type = $this->namespace->simplifyType($type);`
`403`	`403`	`}`
`404`	`404`
`405`		`- if ($nullable && strcasecmp($type, 'mixed')) {`
`406`		`- $type = str_contains($type, '\|')`
`407`		`- ? $type . '\|null'`
`408`		`- : '?' . $type;`
`409`		`- }`
`410`		`-`
`411`		`- return $type;`
	`405`	`+ return $nullable`
	`406`	`+ ? Type::nullable($type)`
	`407`	`+ : $type;`
`412`	`408`	`}`
`413`	`409`
`414`	`410`