Skip to content

Commit

Permalink
Simplify lots of usage checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@muglug @bdsl
muglug authored and bdsl committed Jun 26, 2021
1 parent 67d68a5 commit f9b1aa5
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 63 deletions.
11 changes: 11 additions & 0 deletions src/Psalm/Context.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,4 +831,15 @@ public function mergeFunctionExceptions(
$this->possibly_thrown_exceptions[$possibly_thrown_exception][$hash] = $codelocation;
}
}

public function insideUse(): bool
{
return $this->inside_assignment
|| $this->inside_return
|| $this->inside_call
|| $this->inside_general_use
|| $this->inside_conditional
|| $this->inside_throw
|| $this->inside_isset;
}
}
2 changes: 1 addition & 1 deletion src/Psalm/Internal/Analyzer/IssueData.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function __construct(
$this->file_name = $file_name;
$this->file_path = $file_path;
$this->snippet = $snippet;
$this->selected_text = $selected_text;
$this->selected_text = trim($selected_text);
$this->from = $from;
$this->to = $to;
$this->snippet_from = $snippet_from;
Expand Down
7 changes: 1 addition & 6 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,12 +935,7 @@ public static function verifyType(
$statements_analyzer,
$statements_analyzer->getFilePath(),
true,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
);
}
}
Expand Down
6 changes: 1 addition & 5 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -992,11 +992,7 @@ private static function checkFunctionCallPurity(
* If a function is pure, and has the return type of 'no-return',
* it's okay to dismiss it's return value.
*/
if (!$context->inside_assignment
&& !$context->inside_call
&& !$context->inside_return
&& !$context->inside_general_use
&& !$context->inside_throw
if (!$context->insideUse()
&& !self::callUsesByReferenceArguments($function_call_info, $stmt)
&& !(
$function_call_info->function_storage &&
Expand Down
28 changes: 4 additions & 24 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/AtomicMethodCallAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,7 @@ public static function analyze(
: null,
$statements_analyzer->getFilePath(),
false,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
);

$fake_method_exists = false;
Expand Down Expand Up @@ -327,12 +322,7 @@ public static function analyze(
: null,
$statements_analyzer->getFilePath(),
true,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
)
) {
$new_call_context = MissingMethodCallHandler::handleMagicMethod(
Expand Down Expand Up @@ -734,12 +724,7 @@ private static function handleTemplatedMixins(
: null,
$statements_analyzer->getFilePath(),
true,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
)) {
$lhs_type_part = clone $lhs_type_part_new;
$class_storage = $mixin_class_storage;
Expand Down Expand Up @@ -807,12 +792,7 @@ private static function handleRegularMixins(
: null,
$statements_analyzer->getFilePath(),
true,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
)) {
$mixin_declaring_class_storage = $codebase->classlike_storage_provider->get(
$class_storage->mixin_declaring_fqcln
Expand Down
4 changes: 0 additions & 4 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/MethodCallAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ public static function analyze(

$context->inside_call = true;

$was_inside_general_use = $context->inside_general_use;
$context->inside_general_use = true;

$existing_stmt_var_type = null;

if (!$real_method_call) {
Expand All @@ -70,7 +67,6 @@ public static function analyze(
}

$context->inside_call = $was_inside_call;
$context->inside_general_use = $was_inside_general_use;

if ($stmt->var instanceof PhpParser\Node\Expr\Variable) {
if (is_string($stmt->var->name) && $stmt->var->name === 'this' && !$statements_analyzer->getFQCLN()) {
Expand Down
21 changes: 3 additions & 18 deletions ...lm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,7 @@ private static function handleNamedCall(
$statements_analyzer,
$statements_analyzer->getFilePath(),
false,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
);

$fake_method_exists = false;
Expand Down Expand Up @@ -348,12 +343,7 @@ private static function handleNamedCall(
: null,
$statements_analyzer->getFilePath(),
true,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
)) {
$mixin_candidates = [];
foreach ($class_storage->templatedMixins as $mixin_candidate) {
Expand Down Expand Up @@ -473,12 +463,7 @@ private static function handleNamedCall(
: null,
$statements_analyzer->getFilePath(),
true,
$context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_assignment
|| $context->inside_conditional
|| $context->inside_throw
$context->insideUse()
)) {
if ($codebase->methods->return_type_provider->has($fq_class_name)) {
$return_type_candidate = $codebase->methods->return_type_provider->getReturnType(
Expand Down
10 changes: 5 additions & 5 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/VariableFetchAnalyzer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,12 +423,12 @@ private static function addDataFlowToVariable(

if ($statements_analyzer->data_flow_graph
&& $codebase->find_unused_variables
&& ($context->inside_call
|| $context->inside_return
|| $context->inside_conditional
&& ($context->inside_return
|| $context->inside_call
|| $context->inside_general_use
|| $context->inside_isset
|| $context->inside_throw)
|| $context->inside_conditional
|| $context->inside_throw
|| $context->inside_isset)
) {
if (!$stmt_type->parent_nodes) {
$assignment_node = DataFlowNode::getForAssignment(
Expand Down

0 comments on commit f9b1aa5

Please sign in to comment.