Merge branch refs/heads/1.12.x into 2.0.x

Author: phpstan-bot

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

@@ -0,0 +1,33 @@
+<?php
+
+namespace Bug5077;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<int, array<string, int|string>> $array
+ */
+function test(array &$array): void
+{
+	$array[] = ['test' => rand(), 'p' => 'test'];
+}
+
+function (): void {
+	$array = [];
+	$array['key'] = [];
+
+	assertType('array{key: array{}}', $array);
+	assertType('array{}', $array['key']);
+
+	test($array['key']);
+	assertType('array{key: array<int, array<string, int|string>>}', $array);
+	assertType('array<int, array<string, int|string>>', $array['key']);
+
+	test($array['key']);
+	assertType('array{key: array<int, array<string, int|string>>}', $array);
+	assertType('array<int, array<string, int|string>>', $array['key']);
+
+	test($array['key']);
+	assertType('array{key: array<int, array<string, int|string>>}', $array);
+	assertType('array<int, array<string, int|string>>', $array['key']);
+};

tests/PHPStan/Rules/DeadCode/UnusedPrivatePropertyRuleTest.php

@@ -314,4 +314,18 @@ public function testBug8781(): void
 		$this->analyse([__DIR__ . '/data/bug-8781.php'], []);
 	}
 
+	public function testBug9361(): void
+	{
+		$this->alwaysWrittenTags = [];
+		$this->alwaysReadTags = [];
+		$this->analyse([__DIR__ . '/data/bug-9361.php'], []);
+	}
+
+	public function testBug7251(): void
+	{
+		$this->alwaysWrittenTags = [];
+		$this->alwaysReadTags = [];
+		$this->analyse([__DIR__ . '/data/bug-7251.php'], []);
+	}
+
 }

tests/PHPStan/Rules/DeadCode/data/bug-7251.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Bug7251;
+
+class Foo
+{
+	private $bar;
+
+	public function doStuff()
+	{
+		$this->setToOne($this->bar);
+	}
+
+	private function setToOne(&$var)
+	{
+		$var = 1;
+	}
+}

tests/PHPStan/Rules/DeadCode/data/bug-9361.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Bug9361;
+
+class Option
+{
+	/**
+	 * @var mixed
+	 */
+	private $Bound;
+
+	/**
+	 * @param mixed $var
+	 * @return $this
+	 */
+	public function bind(&$var)
+	{
+		$this->Bound = &$var;
+
+		return $this;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return $this
+	 */
+	public function setValue($value)
+	{
+		if ($this->Bound !== $value) {
+			$this->Bound = $value;
+		}
+
+		return $this;
+	}
+}
+
+class Command
+{
+	/**
+	 * @var mixed
+	 */
+	private $Value;
+
+	/**
+	 * @return Option[]
+	 */
+	public function getOptions()
+	{
+		return [
+			(new Option())->bind($this->Value),
+		];
+	}
+
+	public function run(): void
+	{
+		$value = $this->Value;
+	}
+}

tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php

@@ -623,4 +623,23 @@ public function testBug11275(): void
 		]);
 	}
 
+	public function testBug11617(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-11617.php'], [
+			[
+				'Property Bug11617\HelloWorld::$params (array<string, string>) does not accept array<int|string, array|string>.',
+				14,
+			],
+			[
+				'Property Bug11617\HelloWorld::$params (array<string, string>) does not accept array<int|string, array|string>.',
+				16,
+			],
+			[
+				'Property Bug11617\HelloWorld::$params (array<string, string>) does not accept array<int|string, array|string>.',
+				21,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Properties/data/bug-11617.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug11617;
+
+class HelloWorld
+{
+	/**
+	 * @var array<string, string>
+	 */
+	private $params;
+
+	public function sayHello(string $query): void
+	{
+		\parse_str($query, $this->params);
+		\parse_str($query, $tmp);
+		$this->params = $tmp;
+
+		/** @var array<string, string> $foo */
+		$foo = [];
+		\parse_str($query, $foo);
+		$this->params = $foo;
+	}
+}