diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/PropertyAssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/PropertyAssignmentAnalyzer.php index f9b3e993b..b51a12229 100644 --- a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/PropertyAssignmentAnalyzer.php +++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/PropertyAssignmentAnalyzer.php @@ -389,7 +389,7 @@ class PropertyAssignmentAnalyzer ), $statements_analyzer->getSuppressedIssues() )) { - return false; + // fall through } } else { if (IssueBuffer::accepts( @@ -400,7 +400,7 @@ class PropertyAssignmentAnalyzer ), $statements_analyzer->getSuppressedIssues() )) { - return false; + // fall through } } @@ -814,7 +814,7 @@ class PropertyAssignmentAnalyzer ), $statements_analyzer->getSuppressedIssues() )) { - return false; + // fall through } return; diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php index 2cdd4740e..ab8aa0020 100644 --- a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php +++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php @@ -1316,7 +1316,7 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\ $statements_analyzer->getSuppressedIssues() ) ) { - return false; + // fall through } // If a `@property` annotation is set, the type of the value passed to the @@ -1387,7 +1387,7 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\ ), $statements_analyzer->getSuppressedIssues() )) { - return false; + // fall through } } else { if (IssueBuffer::accepts( @@ -1400,7 +1400,7 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\ ), $statements_analyzer->getSuppressedIssues() )) { - return false; + // fall through } } } @@ -1421,7 +1421,7 @@ class MethodCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\ $statements_analyzer->getSuppressedIssues() ) ) { - return false; + // fall through } if (isset($class_storage->pseudo_property_get_types['$' . $prop_name])) { diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php index a00c6d053..44dcc8c77 100644 --- a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php +++ b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/PropertyFetchAnalyzer.php @@ -846,7 +846,7 @@ class PropertyFetchAnalyzer ), $statements_analyzer->getSuppressedIssues() )) { - return false; + // fall through } return; diff --git a/tests/CallableTest.php b/tests/CallableTest.php index 05f0ca791..cd701ff1a 100644 --- a/tests/CallableTest.php +++ b/tests/CallableTest.php @@ -757,7 +757,7 @@ class CallableTest extends TestCase } }' ], - 'publicCallableFromInside' => [ + 'PHP71-publicCallableFromInside' => [ ' [ + 'PHP71-protectedCallableFromInside' => [ ' 'InvalidArgument' ], - 'privateCallable' => [ + 'PHP71-privateCallable' => [ ' [[306], [306, 452]], + 'error_positions' => [[306], [306, 452, 452]], ], 'addPropertyDocblock' => [ [