Add more foreach with by-ref $value tests (#4934)

Author: staabm

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

@@ -28,6 +28,37 @@ function bar(array $list): void
 	assertType("list<'foo'>", $list);
 }
 
+/**
+ * @param list<mixed> $list
+ */
+function bar2(array $list): void
+{
+	foreach ($list as $key => &$value) {
+		if (rand(0, 1)) {
+			$value = 'foo';
+		}
+		$key = 'bar';
+	}
+
+	assertType("list<mixed>", $list);
+}
+
+/**
+ * @param list<mixed> $list
+ */
+function bar3(array $list): void
+{
+	foreach ($list as &$value) {
+		if (rand(0, 1)) {
+			$value = 'foo';
+		} else {
+			$value = 'maybe';
+		}
+	}
+
+	assertType("list<mixed>", $list); // could be list<'foo'|'maybe'>
+}
+
 /**
  * @param list<string> $list
  */

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

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace Bug13851;
+
+use function PHPStan\Testing\assertType;
+
+class Transaction
+{
+	public function __construct(public int $value)
+	{
+	}
+
+	public function withValue(int $value): self
+	{
+		return new self($value);
+	}
+}
+
+/**
+ * @return array<string, non-empty-list<Transaction>>
+ */
+function getPositions(): array
+{
+	return ['AAPL' => [new Transaction(50)], 'TSLA' => [new Transaction(50), new Transaction(100)]];
+}
+
+$positions = getPositions();
+
+foreach ($positions as $symbol => &$transactions) {
+	foreach ($transactions as &$transaction) {
+		$transaction = $transaction->withValue(60);
+	}
+}
+
+assertType('array<string, non-empty-list<Bug13851\Transaction>>', $positions);

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

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bug14083;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param list<string> $convert
+ */
+function example(array $convert): void {
+	foreach ($convert as &$item) {
+		$item = strtoupper($item);
+	}
+	assertType('list<string>', $convert);
+}
+
+/**
+ * @param list<string> $convert
+ */
+function example2(array $convert): void {
+	foreach ($convert as $key => $item) {
+		$convert[$key] = strtoupper($item);
+	}
+	assertType('list<uppercase-string>', $convert);
+}

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

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bug14084;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<string, list<string>> $convert
+ */
+function example(array $convert): void
+{
+	foreach ($convert as &$inner) {
+		foreach ($inner as &$val) {
+			$val = strtoupper($val); // https://github.com/phpstan/phpstan/issues/14083
+		}
+	}
+	assertType('array<string, list<string>>', $convert);
+}
+
+/**
+ * @param array<string, list<string>> $convert
+ */
+function example2(array $convert): void
+{
+	foreach ($convert as &$inner) {
+		foreach ($inner as $key => $val) {
+			$inner[$key] = strtoupper($val);
+		}
+	}
+	assertType('array<string, list<string>>', $convert);
+}
+
+/**
+ * @param array<string, list<string>> $convert
+ */
+function example3(array &$convert): void
+{
+	foreach ($convert as $outerKey => $inner) {
+		foreach ($inner as $key => $val) {
+			$convert[$outerKey][$key] = strtoupper($val);
+		}
+	}
+	assertType('array<string, list<string>>', $convert);
+}

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -1305,4 +1305,9 @@ public function testBug5946(): void
 		]);
 	}
 
+	public function testBug9669(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-9669.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-9669.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Bug9669;
+
+class HelloWorld
+{
+	/**
+	 * @param array<int, array{a: string}> $sets
+	 *
+	 * @return array<int, array{a: string, b: bool}>
+	 */
+	public function sayHello(array $sets): array
+	{
+		foreach ($sets as &$set) {
+			$set['b'] = false;
+		}
+
+		return $sets;
+	}
+}