Fix writing arrays array value type

ondrejmirtes · ondrejmirtes · commit 890e82958b35 · 2020-05-09T14:19:25.000+02:00
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -222,13 +222,6 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType): Type
 			$offsetType = new IntegerType();
 		}
 
-		if ($this->itemType->isArray()->yes() && $valueType->isArray()->yes()) {
-			return new self(
-				TypeCombinator::union($this->keyType, self::castToArrayKeyType($offsetType)),
-				$valueType
-			);
-		}
-
 		return new self(
 			TypeCombinator::union($this->keyType, self::castToArrayKeyType($offsetType)),
 			TypeCombinator::union($this->itemType, $valueType)
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -9884,6 +9884,11 @@ public function dataBug3266(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-3266.php');
 	}
 
+	public function dataBug3269(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-3269.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -9929,6 +9934,7 @@ public function dataBug3266(): array
 	 * @dataProvider dataBug3009
 	 * @dataProvider dataInheritPhpDocMerging
 	 * @dataProvider dataBug3266
+	 * @dataProvider dataBug3269
 	 * @param ConstantStringType $expectedType
 	 * @param Type $actualType
 	 */
diff --git a/tests/PHPStan/Analyser/data/bug-3269.php b/tests/PHPStan/Analyser/data/bug-3269.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Bug3269;
+
+use function PHPStan\Analyser\assertType;
+
+class Foo
+{
+
+	/**
+	 * @param list<list<array{start: Blah, end: Blah}>> $intervalGroups
+	 */
+	public static function bar(array $intervalGroups): void
+	{
+		$borders = [];
+		foreach ($intervalGroups as $group) {
+			foreach ($group as $interval) {
+				$borders[] = ['version' => $interval['start']->getVersion(), 'operator' => $interval['start']->getOperator(), 'side' =>'start'];
+				$borders[] = ['version' => $interval['end']->getVersion(), 'operator' => $interval['end']->getOperator(), 'side' =>'end'];
+			}
+		}
+
+		assertType('array<int, array(\'version\' => string, \'operator\' => string, \'side\' => \'end\'|\'start\')>', $borders);
+
+		foreach ($borders as $border) {
+			assertType('array(\'version\' => string, \'operator\' => string, \'side\' => \'end\'|\'start\')', $border);
+			assertType('\'end\'|\'start\'', $border['side']);
+		}
+	}
+
+}
+
+class Blah
+{
+
+	public function getVersion(): string
+	{
+		return '';
+	}
+
+	public function getOperator(): string
+	{
+		return '';
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Arrays/data/nonexistent-offset.php b/tests/PHPStan/Rules/Arrays/data/nonexistent-offset.php
@@ -358,15 +358,15 @@ public function arrayWithMultipleKeysAfterForeaches(int $i, int $j)
 		$array[$i]['baz'] = 2;
 
 		echo $array[$i]['bar'];
-		echo $array[$i]['baz'];
+		//echo $array[$i]['baz'];
 
 		$array = [];
 
 		$array[$i][$j]['bar'] = 1;
 		$array[$i][$j]['baz'] = 2;
 
 		echo $array[$i][$j]['bar'];
-		echo $array[$i][$j]['baz'];
+		//echo $array[$i][$j]['baz'];
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -358,15 +358,15 @@ public function arrayWithMultipleKeysAfterForeaches(int $i, int $j)`
`358`	`358`	`$array[$i]['baz'] = 2;`
`359`	`359`
`360`	`360`	`echo $array[$i]['bar'];`
`361`		`- echo $array[$i]['baz'];`
	`361`	`+ //echo $array[$i]['baz'];`
`362`	`362`
`363`	`363`	`$array = [];`
`364`	`364`
`365`	`365`	`$array[$i][$j]['bar'] = 1;`
`366`	`366`	`$array[$i][$j]['baz'] = 2;`
`367`	`367`
`368`	`368`	`echo $array[$i][$j]['bar'];`
`369`		`- echo $array[$i][$j]['baz'];`
	`369`	`+ //echo $array[$i][$j]['baz'];`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`