danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix #4751 - allow MethodSignatureMismatch to be overridable when info comes from docblock

Browse Source
This commit is contained in:
Matt Brown 2020-12-02 15:13:28 -05:00
parent e2bb02e93c
commit db8a3ab846
6 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Psalm/Internal/Analyzer/MethodComparator.php
View File

@ -252,7 +252,8 @@ class MethodComparator
new MethodSignatureMismatch(
'Method ' . $cased_guide_method_id . ' is declared final and cannot be overridden',
$code_location
)
),
$guide_method_storage->final_from_docblock ? $suppressed_issues : []
)) {
// fall through
}

5
src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php
View File

@ -569,7 +569,10 @@ class ClassLikeNodeScanner
$storage->internal = $docblock_info->psalm_internal ?? '';
}
$storage->final = $storage->final || $docblock_info->final;
if ($docblock_info->final && !$storage->final) {
$storage->final = true;
$storage->final_from_docblock = true;
}
$storage->preserve_constructor_signature = $docblock_info->consistent_constructor;

2
src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php
View File

@ -141,6 +141,7 @@ class FunctionLikeNodeScanner
$storage->defining_fqcln = '';
$storage->is_static = $stmt->isStatic();
$storage->final = $this->classlike_storage && $this->classlike_storage->final;
$storage->final_from_docblock = $this->classlike_storage && $this->classlike_storage->final_from_docblock;
} elseif ($stmt instanceof PhpParser\Node\Stmt\Function_) {
$cased_function_id =
($this->aliases->namespace ? $this->aliases->namespace . '\\' : '') . $stmt->name->name;
@ -293,6 +294,7 @@ class FunctionLikeNodeScanner
$storage->abstract = $stmt->isAbstract();
$storage->final = $classlike_storage->final || $stmt->isFinal();
$storage->final_from_docblock = $classlike_storage->final_from_docblock;
if ($stmt->isPrivate()) {
$storage->visibility = ClassLikeAnalyzer::VISIBILITY_PRIVATE;

5
src/Psalm/Storage/ClassLikeStorage.php
View File

@ -166,6 +166,11 @@ class ClassLikeStorage
*/
public $final = false;
/**
* @var bool
*/
public $final_from_docblock = false;
/**
* @var array<lowercase-string, string>
*/

5
src/Psalm/Storage/MethodStorage.php
View File

@ -20,6 +20,11 @@ class MethodStorage extends FunctionLikeStorage
*/
public $final = false;
/**
* @var bool
*/
public $final_from_docblock = false;
/**
* @var bool
*/

19
tests/MethodSignatureTest.php
View File

@ -828,6 +828,25 @@ class MethodSignatureTest extends TestCase
[],
'8.0'
],
'suppressDocblockFinal' => [
'<?php
/**
* @final
*/
class A {
public function foo(): void {}
}
/**
* @psalm-suppress InvalidExtendClass
*/
class B extends A {
/**
* @psalm-suppress MethodSignatureMismatch
*/
public function foo(): void {}
}'
],
];
}