Less aggressive dumbing down arrays

Author: ondrejmirtes

src/Type/TypeCombinator.php

@@ -708,10 +708,6 @@ private static function countConstantArrayValueTypes(array $types): int
 	{
 		$constantArrayValuesCount = 0;
 		foreach ($types as $type) {
-			if ($type instanceof ConstantArrayType) {
-				$constantArrayValuesCount += count($type->getValueTypes());
-			}
-
 			TypeTraverser::map($type, static function (Type $type, callable $traverse) use (&$constantArrayValuesCount): Type {
 				if ($type instanceof ConstantArrayType) {
 					$constantArrayValuesCount += count($type->getValueTypes());

tests/PHPStan/Analyser/data/bug-8004.php

@@ -73,7 +73,7 @@ public function getErrorsOnInvalidQuestions(array $importQuiz, int $key): array
             }
         }
 
-		assertType("list<non-empty-array<literal-string&non-falsy-string, 'empty_answer'|'empty_question'|'invalid_answer_1_too_long'|'invalid_answer_1_type'|'invalid_answer_2_too_long'|'invalid_answer_2_type'|'invalid_answer_3_too_long'|'invalid_answer_3_type'|'invalid_answer_4_too_long'|'invalid_answer_4_type'|'invalid_question_too_long'|'invalid_right_answer'|int>&oversized-array>&oversized-array", $errors);
+		assertType("list<array{line: int, type: 'empty_answer'|'empty_question'|'invalid_answer_1_too_long'|'invalid_answer_1_type'|'invalid_answer_2_too_long'|'invalid_answer_2_type'|'invalid_answer_3_too_long'|'invalid_answer_3_type'|'invalid_answer_4_too_long'|'invalid_answer_4_type'|'invalid_question_too_long'|'invalid_right_answer', value: int}>&oversized-array", $errors);
 
         return $errors;
     }