danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Don’t remove trait methods

Browse Source
This commit is contained in:
Brown 2019-04-17 15:12:52 -04:00
parent b1044b267d
commit ac562563a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Internal/Codebase/ClassLikes.php
View File

@ -776,6 +776,8 @@ class ClassLikes
$method_id = $appearing_method_id; $method_id = $appearing_method_id;
$declaring_classlike_storage = $classlike_storage;
if (isset($classlike_storage->methods[$method_name])) { if (isset($classlike_storage->methods[$method_name])) {
$method_storage = $classlike_storage->methods[$method_name]; $method_storage = $classlike_storage->methods[$method_name];
} else { } else {
@ -846,7 +848,7 @@ class ClassLikes
if ($codebase->alter_code) { if ($codebase->alter_code) {
if ($method_storage->stmt_location if ($method_storage->stmt_location
&& !$classlike_storage->is_trait && !$declaring_classlike_storage->is_trait
&& isset($project_analyzer->getIssuesToFix()['PossiblyUnusedMethod']) && isset($project_analyzer->getIssuesToFix()['PossiblyUnusedMethod'])
&& !$codebase->analyzer->hasMixedMemberName(strtolower($method_name)) && !$codebase->analyzer->hasMixedMemberName(strtolower($method_name))
&& !IssueBuffer::isSuppressed($issue, $method_storage->suppressed_issues) && !IssueBuffer::isSuppressed($issue, $method_storage->suppressed_issues)
@ -873,7 +875,7 @@ class ClassLikes
if ($codebase->alter_code) { if ($codebase->alter_code) {
if ($method_storage->stmt_location if ($method_storage->stmt_location
&& !$classlike_storage->is_trait && !$declaring_classlike_storage->is_trait
&& isset($project_analyzer->getIssuesToFix()['UnusedMethod']) && isset($project_analyzer->getIssuesToFix()['UnusedMethod'])
&& !$codebase->analyzer->hasMixedMemberName(strtolower($method_name)) && !$codebase->analyzer->hasMixedMemberName(strtolower($method_name))
&& !IssueBuffer::isSuppressed($issue, $method_storage->suppressed_issues) && !IssueBuffer::isSuppressed($issue, $method_storage->suppressed_issues)
@ -944,7 +946,6 @@ class ClassLikes
if ($codebase->alter_code) { if ($codebase->alter_code) {
if ($property_storage->stmt_location if ($property_storage->stmt_location
&& !$classlike_storage->is_trait
&& isset($project_analyzer->getIssuesToFix()['PossiblyUnusedProperty']) && isset($project_analyzer->getIssuesToFix()['PossiblyUnusedProperty'])
&& !$codebase->analyzer->hasMixedMemberName('$' . $property_name) && !$codebase->analyzer->hasMixedMemberName('$' . $property_name)
&& !IssueBuffer::isSuppressed($issue, $classlike_storage->suppressed_issues) && !IssueBuffer::isSuppressed($issue, $classlike_storage->suppressed_issues)
@ -969,7 +970,6 @@ class ClassLikes
if ($codebase->alter_code) { if ($codebase->alter_code) {
if ($property_storage->stmt_location if ($property_storage->stmt_location
&& !$classlike_storage->is_trait
&& isset($project_analyzer->getIssuesToFix()['UnusedProperty']) && isset($project_analyzer->getIssuesToFix()['UnusedProperty'])
&& !$codebase->analyzer->hasMixedMemberName('$' . $property_name) && !$codebase->analyzer->hasMixedMemberName('$' . $property_name)
&& !IssueBuffer::isSuppressed($issue, $classlike_storage->suppressed_issues) && !IssueBuffer::isSuppressed($issue, $classlike_storage->suppressed_issues)