danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix issue where documented self param confuses

Browse Source
This commit is contained in:
Matthew Brown 2019-01-05 08:43:37 -05:00
parent 407e4473f7
commit 9f16ab9cb5
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Psalm/Internal/Analyzer/MethodAnalyzer.php
View File

@ -620,18 +620,32 @@ class MethodAnalyzer extends FunctionLikeAnalyzer
&& $guide_param->type
&& $implementer_param->type->getId() !== $guide_param->type->getId()
) {
if (!TypeAnalyzer::isContainedBy(
$implementer_method_storage_param_type = ExpressionAnalyzer::fleshOutType(
$codebase,
$implementer_param->type,
$implementer_classlike_storage->name,
$implementer_classlike_storage->name
);
$guide_method_storage_param_type = ExpressionAnalyzer::fleshOutType(
$codebase,
$guide_param->type,
$implementer_param->type,
$guide_classlike_storage->name,
$guide_classlike_storage->name
);
if (!TypeAnalyzer::isContainedBy(
$codebase,
$guide_method_storage_param_type,
$implementer_method_storage_param_type,
false,
false
)) {
if (IssueBuffer::accepts(
new MoreSpecificImplementedParamType(
'Argument ' . ($i + 1) . ' of ' . $cased_implementer_method_id . ' has wrong type \'' .
$implementer_param->type->getId() . '\', expecting \'' .
$guide_param->type->getId() . '\' as defined by ' .
$implementer_method_storage_param_type->getId() . '\', expecting \'' .
$guide_method_storage_param_type->getId() . '\' as defined by ' .
$cased_guide_method_id,
$implementer_method_storage->params[$i]->location
?: $code_location

15
tests/MethodSignatureTest.php
View File

@ -335,6 +335,21 @@ class MethodSignatureTest extends TestCase
}
}',
],
'inheritDocumentedSelf' => [
'<?php
interface I {
/**
* @param self $f
*/
public function foo(self $f) : self;
}
class C implements I {
public function foo(I $i) : I {
return new C();
}
}'
],
];
}