Fix PDOException::getCode return type

phpstan · Feb 23, 2022 · 9d81ab9 · 9d81ab9
1 parent e504c3f
commit 9d81ab9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Type/Php/ThrowableReturnTypeExtension.php b/src/Type/Php/ThrowableReturnTypeExtension.php
@@ -50,14 +50,16 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 					continue 2;
 				}
 			}
+
 			if ($pdoException->isSuperTypeOf($classType)->yes()) {
-				$types[] = new StringType();
+				$types[] = new BenevolentUnionType([new IntegerType(), new StringType()]);
 				continue;
 			}
 
 			if (in_array(strtolower($class), [
 				'throwable',
 				'exception',
+				'runtimeexception',
 			], true)) {
 				$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
@@ -11,10 +11,11 @@ public function doFoo(\Throwable $t): void
 	{
 		assertType('(int|string)', (new \Exception())->getCode());
 		assertType('(int|string)', $t->getCode());
-		assertType('int', (new \RuntimeException())->getCode());
-		assertType('string', (new \PDOException())->getCode());
+		assertType('(int|string)', (new \RuntimeException())->getCode());
+		assertType('int', (new \LogicException())->getCode());
+		assertType('(int|string)', (new \PDOException())->getCode());
 		assertType('int', (new MyException())->getCode());
-		assertType('string', (new SubPDOException())->getCode());
+		assertType('(int|string)', (new SubPDOException())->getCode());
 		assertType('1|2|3', (new ExceptionWithMethodTag())->getCode());
 	}
 
@@ -24,7 +25,7 @@ public function doFoo(\Throwable $t): void
 	 */
 	public function doBar($exception): void
 	{
-		assertType('int|string', $exception->getCode());
+		assertType('(int|string)', $exception->getCode());
 	}
 
 }