simpler fix

Author: staabm

src/Type/CallableType.php

@@ -84,14 +84,20 @@ public function __construct(
 		?TemplateTypeMap $resolvedTemplateTypeMap = null,
 		private array $templateTags = [],
 		?TrinaryLogic $isPure = null,
+		?bool $isCommonCallable = null,
 	)
 	{
 		$this->parameters = $parameters ?? [];
 		$this->returnType = $returnType ?? new MixedType();
-		$this->isCommonCallable = $parameters === null && $returnType === null;
 		$this->templateTypeMap = $templateTypeMap ?? TemplateTypeMap::createEmpty();
 		$this->resolvedTemplateTypeMap = $resolvedTemplateTypeMap ?? TemplateTypeMap::createEmpty();
 		$this->isPure = $isPure ?? TrinaryLogic::createMaybe();
+
+		if ($isCommonCallable !== null) {
+			$this->isCommonCallable = $isCommonCallable;
+		} else {
+			$this->isCommonCallable = $parameters === null && $returnType === null;
+		}
 	}
 
 	/**

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -315,15 +315,13 @@ public function getArray(): Type
 
 		if ($this->degradeClosures) {
 			$itemTypes = [];
-			$returnTypes = [];
+			$itemTypes[] = new CallableType(isCommonCallable: false);
 			foreach ($this->valueTypes as $valueType) {
 				if ($valueType instanceof ClosureType) {
-					$returnTypes[] = $valueType->getReturnType();
 					continue;
 				}
 				$itemTypes[] = $valueType;
 			}
-			$itemTypes[] = new CallableType(null, TypeCombinator::union(...$returnTypes));
 		} else {
 			$itemTypes = $this->valueTypes;
 		}

tests/PHPStan/Analyser/nsrt/degrade-closures-return-types.php

@@ -23,4 +23,4 @@
 assertType('array{Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): 1, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): true}', $arr);
 
 $arr[] = static function () {};
-assertType('non-empty-list<callable(): (1|void|true)>&oversized-array', $arr);
+assertType('non-empty-list<callable(): mixed>&oversized-array', $arr);

tests/PHPStan/Analyser/nsrt/degrade-closures.php

@@ -23,4 +23,4 @@
 assertType('array{Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void, Closure(): void}', $arr);
 
 $arr[] = static function () {};
-assertType('non-empty-list<callable(): void>&oversized-array', $arr);
+assertType('non-empty-list<callable(): mixed>&oversized-array', $arr);