Merge branch '1.4.x'

Author: ondrejmirtes

tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php

@@ -289,4 +289,31 @@ public function testBug6791(): void
 		]);
 	}
 
+	public function testBug6786(): void
+	{
+		if (PHP_VERSION_ID < 70400) {
+			self::markTestSkipped('Test requires PHP 7.4.');
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-6786.php'], []);
+	}
+
+	public function testUnionTypeError(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			self::markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->analyse([__DIR__ . '/data/union-type-error.php'], [
+			[
+				'Dead catch - TypeError is never thrown in the try block.',
+				14,
+			],
+			[
+				'Dead catch - TypeError is never thrown in the try block.',
+				22,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Exceptions/data/bug-6786.php

@@ -0,0 +1,24 @@
+<?php // lint >= 7.4
+
+declare(strict_types = 1);
+
+namespace Bug6786;
+
+class HelloWorld
+{
+	protected int $id;
+	protected string $code;
+	protected bool $suggest;
+
+	/**
+	 * @param array|mixed[] $row
+	 * @return void
+	 */
+	protected function mapping(array $row): void
+	{
+		$this->id = (int) $row['id'];
+		$this->code = $row['code'];
+		$this->suggest = (bool) $row['suggest'];
+	}
+
+}

tests/PHPStan/Rules/Exceptions/data/union-type-error.php

@@ -0,0 +1,29 @@
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
+
+namespace UnionTypeError;
+
+class Foo {
+	public string|int $stringOrInt;
+	public string|array $stringOrArray;
+
+	public function bar() {
+		try {
+			$this->stringOrInt = "";
+		} catch (\TypeError $e) {}
+
+		try {
+			$this->stringOrInt = true;
+		} catch (\TypeError $e) {}
+
+		try {
+			$this->stringOrArray = [];
+		} catch (\TypeError $e) {}
+
+		try {
+			$this->stringOrInt = $this->stringOrArray;
+		} catch (\TypeError $e) {}
+	}
+}
+