Regression tests

Closes phpstan/phpstan#12355
Closes phpstan/phpstan#9828

Author: ondrejmirtes

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

@@ -0,0 +1,48 @@
+<?php
+
+namespace Bug12355;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @phpstan-type AnimalData array{
+ *  animalSpecificData: ValidType,
+ *  habitat?: string,
+ * }
+ * @template ValidType of array{
+ *  name: string,
+ *  ...,
+ * }
+ */
+abstract class Animal
+{
+	/**
+	 * @param AnimalData $arg
+	 */
+	public function __construct(array $arg) {
+		assertType('ValidType of array{name: string} (class Bug12355\Animal, argument)', $arg['animalSpecificData']);
+		if (isset($arg['habitat'])) {
+			//do things
+		}
+		assertType('ValidType of array{name: string} (class Bug12355\Animal, argument)', $arg['animalSpecificData']);
+	}
+}
+
+/**
+ * @template T of array{name: string, ...}
+ * @param array{first: T, second: T, flag?: bool} $arg
+ */
+function testMergeWithDifferentObjects(array $arg): void
+{
+	assertType('T of array{name: string} (function Bug12355\testMergeWithDifferentObjects(), argument)', $arg['first']);
+
+	// Modifying $arg in one branch causes different ConstantArrayType objects
+	if (isset($arg['flag'])) {
+		$arg['extra'] = true;
+	}
+
+	// After scope merge, $arg's value types for 'first' and 'second' go through
+	// ConstantArrayType::mergeWith() which uses new self() — stripping TemplateConstantArrayType
+	assertType('T of array{name: string} (function Bug12355\testMergeWithDifferentObjects(), argument)', $arg['first']);
+	assertType('T of array{name: string} (function Bug12355\testMergeWithDifferentObjects(), argument)', $arg['second']);
+}

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

@@ -0,0 +1,41 @@
+<?php
+
+namespace Bug9828;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @template T of array{value: int, ...}
+ * @param array<int, T> $array
+ * @return array<int, T>
+ */
+function filter(array $array, int $min_value): array
+{
+	foreach ($array as $key => $row) {
+		if ($row['value'] < $min_value) unset($array[$key]);
+	}
+	return array_values($array);
+}
+
+/**
+ * @template T of array{value: int, ...}
+ * @param array<int, T> $array
+ * @return list<T>
+ */
+function filter2(array $array, int $min_value): array
+{
+	$result = [];
+	foreach ($array as $row) {
+		if ($row['value'] >= $min_value) $result[] = $row;
+	}
+	return $result;
+}
+
+/**
+ * @param array<int, array{value: int, name: string}> $data
+ */
+function test(array $data): void
+{
+	assertType('array<int, array{value: int, name: string}>', filter($data, 5));
+	assertType('list<array{value: int, name: string}>', filter2($data, 5));
+}