UnionTypeHelper - prevent infinite recursion

ondrejmirtes · ondrejmirtes · commit bb3da26d5627 · 2024-05-15T07:04:14.000+02:00
diff --git a/src/Type/UnionTypeHelper.php b/src/Type/UnionTypeHelper.php
@@ -109,7 +109,10 @@ public static function sortTypes(array $types): array
 				return self::compareStrings($a->describe(VerbosityLevel::value()), $b->describe(VerbosityLevel::value()));
 			}
 
-			if ($a->isCallable()->yes() && $b->isCallable()->yes()) {
+			if (
+				($a instanceof CallableType || $a instanceof ClosureType)
+				&& ($b instanceof CallableType || $b instanceof ClosureType)
+			) {
 				return self::compareStrings($a->describe(VerbosityLevel::value()), $b->describe(VerbosityLevel::value()));
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,10 @@ public static function sortTypes(array $types): array`
`109`	`109`	`return self::compareStrings($a->describe(VerbosityLevel::value()), $b->describe(VerbosityLevel::value()));`
`110`	`110`	`}`
`111`	`111`
`112`		`- if ($a->isCallable()->yes() && $b->isCallable()->yes()) {`
	`112`	`+ if (`
	`113`	`+ ($a instanceof CallableType \|\| $a instanceof ClosureType)`
	`114`	`+ && ($b instanceof CallableType \|\| $b instanceof ClosureType)`
	`115`	`+ ) {`
`113`	`116`	`return self::compareStrings($a->describe(VerbosityLevel::value()), $b->describe(VerbosityLevel::value()));`
`114`	`117`	`}`
`115`	`118`