danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Don’t override local docblocks when inheritdoc is present

Browse Source
This commit is contained in:
Matthew Brown 2019-01-19 12:30:14 -05:00
parent bf13ff2e7d
commit 11dc78fd76
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Psalm/Internal/Codebase/Methods.php
View File

@ -192,7 +192,15 @@ class Methods
if ($method_id = $this->getDeclaringMethodId($method_id)) {
$storage = $this->getStorage($method_id);
if (!$storage->inheritdoc) {
if ($storage->inheritdoc) {
$non_null_param_types = array_filter(
$storage->params,
/** @return bool */
function (FunctionLikeParameter $p) {
return $p->type !== null && $p->type->from_docblock;
}
);
} else {
$non_null_param_types = array_filter(
$storage->params,
/** @return bool */
@ -200,8 +208,6 @@ class Methods
return $p->type !== null;
}
);
} else {
$non_null_param_types = false;
}
$params = $storage->params;