Skip to content
20 changes: 20 additions & 0 deletions src/Type/ArrayType.php
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,26 @@ public function setExistingOffsetValueType(Type $offsetType, Type $valueType): T
}
}

if (
$this->itemType->isArray()->yes()
&& !$this->itemType->isConstantArray()->yes()
&& $valueType->isArray()->yes()
&& !$valueType->isConstantArray()->yes()
&& $this->itemType->getIterableValueType()->isArray()->yes()
&& $valueType->getIterableValueType()->isArray()->yes()
) {
$newItemType = $this->itemType->setExistingOffsetValueType(
$valueType->getIterableKeyType(),
$valueType->getIterableValueType(),
);
if ($newItemType !== $this->itemType) {
return new self(
$this->keyType,
$newItemType,
);
}
}

return new self(
$this->keyType,
TypeCombinator::union($this->itemType, $valueType),
Expand Down
65 changes: 65 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-13637.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php declare(strict_types = 1);

namespace Bug13637;

use function PHPStan\Testing\assertType;

/**
* @return array<int, array<int, array<int, array{abc: int, def: int, ghi: int}>>>
*/
function doesNotWork() : array {
$final = [];

for ($i = 0; $i < 5; $i++) {
$j = $i * 2;
$k = $j +1;
$l = $i * 3;
$final[$i][$j][$k]['abc'] = $i;
$final[$i][$j][$k]['def'] = $i;
$final[$i][$j][$k]['ghi'] = $i;

assertType("array{abc: int<0, 4>, def: int<0, 4>, ghi: int<0, 4>}", $final[$i][$j][$k]);
}

return $final;
}

/**
* @return array<int, array<int, array<int, array<int, array{abc: int, def: int, ghi: int}>>>>
*/
function fourLevelsDeep() : array {
$final = [];

for ($i = 0; $i < 5; $i++) {
$j = $i * 2;
$k = $j + 1;
$l = $i * 3;
$final[$i][$j][$k][$l]['abc'] = $i;
$final[$i][$j][$k][$l]['def'] = $i;
$final[$i][$j][$k][$l]['ghi'] = $i;

assertType("array{abc: int<0, 4>, def: int<0, 4>, ghi: int<0, 4>}", $final[$i][$j][$k][$l]);
}

return $final;
}

/**
* @return array<int, array<int, array{abc: int, def: int, ghi: int}>>
*/
function thisWorks() : array {
$final = [];

for ($i = 0; $i < 5; $i++) {
$j = $i * 2;
$k = $j +1;
$l = $i * 3;
$final[$i][$j]['abc'] = $i;
$final[$i][$j]['def'] = $i;
$final[$i][$j]['ghi'] = $i;

assertType("array{abc: int<0, 4>, def: int<0, 4>, ghi: int<0, 4>}", $final[$i][$j]);
}

return $final;
}
Loading