Merge pull request #7525 from VincentLanglet/exceptionCode2

Fix for Exception->getCode return type provider
vimeo · Jan 30, 2022 · 286176f · 286176f
2 parents b45306c + 854a341
commit 286176f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php b/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php
@@ -97,7 +97,11 @@ public static function fetch(
 
         if ($premixin_method_id->method_name === 'getcode'
             && $premixin_method_id->fq_class_name !== Exception::class
-            && in_array(Throwable::class, $class_storage->class_implements)) {
+            && (
+                $codebase->classImplements($premixin_method_id->fq_class_name, Throwable::class)
+                || $codebase->interfaceExtends($premixin_method_id->fq_class_name, Throwable::class)
+            )
+        ) {
             if ($premixin_method_id->fq_class_name === PDOException::class) {
                 return Type::getString();
             } else {

diff --git a/tests/ReturnTypeProvider/ExceptionCodeTest.php b/tests/ReturnTypeProvider/ExceptionCodeTest.php
@@ -35,14 +35,23 @@ function f(\PDOException $e): string {
             ',
             [],
         ];
-        yield 'Exception' => [
+        yield 'CustomThrowable' => [
+            '<?php
+                interface CustomThrowable extends \Throwable {}
+
+                /** @var CustomThrowable $e */
+                $code = $e->getCode();
+            ',
+            ['$code' => 'int'],
+        ];
+        yield 'Throwable' => [
             '<?php
                 /** @var \Throwable $e */
                 $code = $e->getCode();
             ',
             ['$code' => 'int|string'],
         ];
-        yield 'Throwable' => [
+        yield 'Exception' => [
             '<?php
                 /** @var \Exception $e */
                 $code = $e->getCode();