Skip to content

Commit 15cab18

Browse files
authored
Merge branch refs/heads/1.12.x into 2.1.x
2 parents e05aaed + 7d8742a commit 15cab18

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Analyser/MutatingScope.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5140,7 +5140,7 @@ private function generalizeType(Type $a, Type $b, int $depth): Type
51405140
$constantArraysB = TypeCombinator::union(...$constantArrays['b']);
51415141
if (
51425142
$constantArraysA->getIterableKeyType()->equals($constantArraysB->getIterableKeyType())
5143-
&& $constantArraysA->getArraySize()->equals($constantArraysB->getArraySize())
5143+
&& $constantArraysA->getArraySize()->getGreaterOrEqualType()->isSuperTypeOf($constantArraysB->getArraySize())->yes()
51445144
) {
51455145
$resultArrayBuilder = ConstantArrayTypeBuilder::createEmpty();
51465146
foreach (TypeUtils::flattenTypes($constantArraysA->getIterableKeyType()) as $keyType) {

0 commit comments

Comments
 (0)