diff --git a/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php b/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php index cc19d5298b6..2c5f1d7334d 100644 --- a/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php +++ b/rules/TypeDeclaration/NodeAnalyzer/CallTypesResolver.php @@ -127,15 +127,9 @@ private function unionToSingleType(array $staticTypesByArgumentPosition, bool $r $unionedType ); - if ($staticTypeByArgumentPosition[$position] instanceof UnionType) { + if ($removeMixedArray && $staticTypeByArgumentPosition[$position] instanceof UnionType) { foreach ($staticTypeByArgumentPosition[$position]->getTypes() as $subType) { - // has another type over mixed is not allowed, even on native type - if ($subType instanceof MixedType) { - $staticTypeByArgumentPosition[$position] = new MixedType(); - continue 2; - } - - if ($removeMixedArray && $subType instanceof ArrayType && $this->isArrayMixedMixedType($subType)) { + if ($subType instanceof ArrayType && $this->isArrayMixedMixedType($subType)) { $staticTypeByArgumentPosition[$position] = new MixedType(); continue 2; } diff --git a/src/NodeTypeResolver/PHPStan/Type/TypeFactory.php b/src/NodeTypeResolver/PHPStan/Type/TypeFactory.php index 95fc0bb3598..6f12a85490d 100644 --- a/src/NodeTypeResolver/PHPStan/Type/TypeFactory.php +++ b/src/NodeTypeResolver/PHPStan/Type/TypeFactory.php @@ -168,6 +168,12 @@ private function createUnionOrSingleType(array $types): Type return $types[0]; } + foreach ($types as $type) { + if ($type instanceof MixedType) { + return new MixedType(); + } + } + return new UnionType($types); }