Try another strategy

vimeo · Jan 13, 2022 · a950b89 · a950b89
1 parent cbfa6a1
commit a950b89
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 37 deletions.
diff --git a/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php b/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php
@@ -2,6 +2,8 @@
 
 namespace Psalm\Internal\Analyzer\Statements\Expression\Call\Method;
 
+use Exception;
+use PDOException;
 use PhpParser;
 use Psalm\CodeLocation;
 use Psalm\Codebase;
@@ -27,6 +29,7 @@
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Atomic\TTemplateParam;
 use Psalm\Type\Union;
+use Throwable;
 use UnexpectedValueException;
 
 use function array_filter;
@@ -92,6 +95,16 @@ 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)) {
+            if ($premixin_method_id->fq_class_name === PDOException::class) {
+                return Type::parseString('string');
+            } else {
+                return Type::parseString('int');
+            }
+        }
+
         if ($declaring_method_id && $declaring_method_id !== $method_id) {
             $declaring_fq_class_name = $declaring_method_id->fq_class_name;
             $declaring_method_name = $declaring_method_id->method_name;

diff --git a/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php b/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php
@@ -23,7 +23,6 @@
 use Psalm\Internal\Provider\ReturnTypeProvider\ArraySpliceReturnTypeProvider;
 use Psalm\Internal\Provider\ReturnTypeProvider\ArrayUniqueReturnTypeProvider;
 use Psalm\Internal\Provider\ReturnTypeProvider\ArrayValuesReturnTypeProvider;
-use Psalm\Internal\Provider\ReturnTypeProvider\ExceptionCodeReturnTypeProvider;
 use Psalm\Internal\Provider\ReturnTypeProvider\ExplodeReturnTypeProvider;
 use Psalm\Internal\Provider\ReturnTypeProvider\FilterVarReturnTypeProvider;
 use Psalm\Internal\Provider\ReturnTypeProvider\FirstArgStringReturnTypeProvider;

diff --git a/src/Psalm/Internal/Provider/MethodReturnTypeProvider.php b/src/Psalm/Internal/Provider/MethodReturnTypeProvider.php
@@ -59,7 +59,6 @@ public function __construct()
         $this->registerClass(SimpleXmlElementAsXml::class);
         $this->registerClass(PdoStatementReturnTypeProvider::class);
         $this->registerClass(ClosureFromCallableReturnTypeProvider::class);
-        $this->registerClass(ExceptionCodeReturnTypeProvider::class);
     }
 
     /**

diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ExceptionCodeReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ExceptionCodeReturnTypeProvider.php