Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Exception->getCode return type provider #7525

Merged
merged 3 commits into from Jan 30, 2022
Merged

Fix for Exception->getCode return type provider #7525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
584344f
Failing test
VincentLanglet Jan 30, 2022
cd32132
Fix
VincentLanglet Jan 30, 2022
854a341
Use function
VincentLanglet Jan 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
13 changes: 11 additions & 2 deletions tests/ReturnTypeProvider/ExceptionCodeTest.php
View file
Open in desktop
Expand Up @@ -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();
Expand Down