Added regression tests

Author: staabm

tests/PHPStan/Analyser/nsrt/bug-10640.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace Bug10640;
+
+use function PHPStan\Testing\assertType;
+
+$changes = [];
+foreach (toAdd() as $add) {
+	$changes[$add['id']]['add'][] = doSomething($add);
+}
+assertType('array<int, array{add: non-empty-array<int<0, max>, 1>}>', $changes);
+
+foreach (toRem() as $del) {
+	$changes[$add['id']]['del'][] = doSomething($del);
+}
+assertType('array<int, array{add: non-empty-array<int<0, max>, 1>, del?: non-empty-array<int<0, max>, 2>}>', $changes);
+
+foreach ($changes as $changeSet) {
+	if (isset($changeSet['del'])) {
+		doDel($changeSet['del']);
+	}
+	if (isset($changeSet['add'])) {
+		doAdd($changeSet['add']);
+	}
+}

tests/PHPStan/Analyser/nsrt/bug-12078.php

@@ -0,0 +1,67 @@
+<?php declare(strict_types=1);
+
+namespace Bug12078;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @return array <string,string>
+ */
+function returnsData6M(): array
+{
+	return ["A" => 'data A', "B" => 'Data B'];
+}
+
+/**
+ * @return array <string,string>
+ */
+function returnsData3M(): array
+{
+	return ["A" => 'data A', "C" => 'Data C'];
+}
+
+function main()
+{
+	$arrDataByKey = [];
+
+	$arrData6M = returnsData6M();
+	if ([] === $arrData6M) {
+		echo "No data for 6M\n";
+	} else {
+		foreach ($arrData6M as $key => $data) {
+			$arrDataByKey[$key]['6M'][] = $data;
+		}
+	}
+
+	$arrData3M = returnsData3M();
+	if ([] === $arrData3M) {
+		echo "No data for 3M\n";
+	} else {
+		foreach ($arrData3M as $key => $data) {
+			$arrDataByKey[$key]['3M'][] = $data;
+		}
+	}
+	/*
+	So $arrDataByKey looks like
+	[
+		'A'=>[
+			'6M'=>['data A'],
+			'3M'=>['data A']
+		],
+		'B'=>[
+			'6M'=>['data B']
+		],
+		'C'=>[
+			'3M'=>['data C']
+		]
+	]
+	*/
+
+	assertType("array<non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}>", $arrDataByKey);
+	foreach ($arrDataByKey as $key => $arrDataByKeyForKey) {
+		assertType("array<non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}>", $arrDataByKeyForKey);
+		echo [] === ($arrDataByKeyForKey['6M'] ?? []) ? 'No 6M data for key ' . $key . "\n" : 'We got 6M data for key ' . $key . "\n";
+		echo [] === ($arrDataByKeyForKey['3M'] ?? []) ? 'No 3M data for key ' . $key . "\n" : 'We got 3M data for key ' . $key . "\n";
+		assertType("array<non-empty-array{'6M'?: non-empty-list<string>, '3M'?: non-empty-list<string>}>", $arrDataByKeyForKey);
+	}
+}

tests/PHPStan/Analyser/nsrt/bug-2294.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Bug2294;
+
+use function PHPStan\Testing\assertType;
+
+// Removing one of the entries makes the error go away
+
+$entries = ['A' => null, 'B' => null];
+foreach($entries as $key => $value) {
+	$entries[$key] = ['a' => 1, 'b' => 2];
+}
+assertType('array{A: array{a: 1, b: 2}|null, B: array{a: 1, b: 2}|null}', $entries);
+// Uncommenting the next line does NOT make the error go away
+//$entries['A'] = ['a' => 1, 'b' => 2];
+
+// Removing one of these lines also makes the error go away
+$entries['A']['a'] += 1;
+$entries['A']['b'] += 1;
+assertType('array{A: array{a: 2, b: 3}, B: array{a: 1, b: 2}|null}', $entries);

tests/PHPStan/Analyser/nsrt/bug-6173.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Bug6173;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	/**
+	 * @param int[] $ids1
+	 * @param int[] $ids2
+	 */
+	public function sayHello(array $ids1, array $ids2): bool
+	{
+		$res = [];
+		foreach ($ids1 as $id) {
+			$res[$id]['foo'] = $id;
+		}
+
+		foreach ($ids2 as $id) {
+			$res[$id]['bar'] = $id;
+		}
+
+		assertType('array<int, non-empty-array{foo?: int, bar?: int}>', $res);
+		foreach ($res as $id => $r) {
+			assertType('non-empty-array{foo?: int, bar?: int}', $r);
+			return isset($r['foo']);
+		}
+
+		return false;
+	}
+}

tests/PHPStan/Analyser/nsrt/bug-8270.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Bug8270;
+
+use function PHPStan\Testing\assertType;
+
+function (): void {
+	$list = [];
+
+	for ($i = 0; $i < 10; $i++) {
+		$list[] = [
+			'test' => false,
+			'value' => rand(),
+		];
+	}
+	assertType('list<array{test: false, value: int<0, max>}>', $list);
+
+	// TODO: sort list by value asc...
+	$k = array_key_first($list);
+	$list[$k]['test'] = true; // <--- assign only first item!
+
+	foreach ($list as $item) {
+		if ($item['test']) {
+			echo $item['value'];
+		}
+	}
+	assertType('array{test: true, value?: int<0, max>}', $list);
+
+};