Use BenevolentUnion

phpstan · Feb 23, 2022 · 6acfaff · 6acfaff
1 parent 0c68467
commit 6acfaff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Type/Php/ThrowableReturnTypeExtension.php b/src/Type/Php/ThrowableReturnTypeExtension.php
@@ -14,7 +14,6 @@
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
-use PHPStan\Type\UnionType;
 use Throwable;
 use function count;
 use function in_array;
@@ -53,7 +52,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			}
 
 			if ($pdoException->isSuperTypeOf($classType)->yes()) {
-				$types[] = new UnionType([new IntegerType(), new StringType()]);
+				$types[] = new BenevolentUnionType([new IntegerType(), new StringType()]);
 				continue;
 			}
 

diff --git a/tests/PHPStan/Analyser/data/bug-6001.php b/tests/PHPStan/Analyser/data/bug-6001.php
@@ -13,9 +13,9 @@ public function doFoo(\Throwable $t): void
 		assertType('(int|string)', $t->getCode());
 		assertType('(int|string)', (new \RuntimeException())->getCode());
 		assertType('int', (new \LogicException())->getCode());
-		assertType('int|string', (new \PDOException())->getCode());
+		assertType('(int|string)', (new \PDOException())->getCode());
 		assertType('int', (new MyException())->getCode());
-		assertType('int|string', (new SubPDOException())->getCode());
+		assertType('(int|string)', (new SubPDOException())->getCode());
 		assertType('1|2|3', (new ExceptionWithMethodTag())->getCode());
 	}
 
@@ -25,7 +25,7 @@ public function doFoo(\Throwable $t): void
 	 */
 	public function doBar($exception): void
 	{
-		assertType('int|string', $exception->getCode());
+		assertType('(int|string)', $exception->getCode());
 	}
 
 }