simplify and remove redundant variable

vimeo · Jan 15, 2024 · 2414070 · 2414070
1 parent dca17bc
commit 2414070
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 57 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/IfConditionalAnalyzer.php
@@ -371,34 +371,30 @@ public static function handleParadoxicalCondition(
  } elseif (!($stmt instanceof PhpParser\Node\Expr\BinaryOp\NotIdentical)
  && !($stmt instanceof PhpParser\Node\Expr\BinaryOp\Identical)
  && !($stmt instanceof PhpParser\Node\Expr\BooleanNot)) {
- $has_both = false;
- $both_types = $type->getBuilder();
  if (count($type->getAtomicTypes()) > 1) {
+ $both_types = $type->getBuilder();
  foreach ($both_types->getAtomicTypes() as $key => $atomic_type) {
  if ($atomic_type->isTruthy()
  || $atomic_type->isFalsy()
  || $atomic_type instanceof TBool) {
  $both_types->removeType($key);
- continue;
  }
-
- $has_both = true;
  }
- }
 
- if ($has_both) {
- $both_types = $both_types->freeze();
- IssueBuffer::maybeAdd(
- new RiskyTruthyFalsyComparison(
- 'Operand of type ' . $type->getId() . ' contains ' .
- 'type' . (count($both_types->getAtomicTypes()) > 1 ? 's' : '') . ' ' .
- $both_types->getId() . ', which can be falsy and truthy. ' .
- 'This can cause possibly unexpected behavior. Use strict comparison instead.',
- new CodeLocation($statements_analyzer, $stmt),
- $type->getId(),
- ),
- $statements_analyzer->getSuppressedIssues(),
- );
+ if (count($both_types->getAtomicTypes()) > 0) {
+ $both_types = $both_types->freeze();
+ IssueBuffer::maybeAdd(
+ new RiskyTruthyFalsyComparison(
+ 'Operand of type ' . $type->getId() . ' contains ' .
+ 'type' . (count($both_types->getAtomicTypes()) > 1 ? 's' : '') . ' ' .
+ $both_types->getId() . ', which can be falsy and truthy. ' .
+ 'This can cause possibly unexpected behavior. Use strict comparison instead.',
+ new CodeLocation($statements_analyzer, $stmt),
+ $type->getId(),
+ ),
+ $statements_analyzer->getSuppressedIssues(),
+ );
+ }
  }
  }
  }

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BooleanNotAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BooleanNotAnalyzer.php
@@ -45,34 +45,30 @@ public static function analyze(
  } elseif ($expr_type->isAlwaysFalsy()) {
  $stmt_type = new TTrue($expr_type->from_docblock);
  } else {
- $has_both = false;
- $both_types = $expr_type->getBuilder();
  if (count($expr_type->getAtomicTypes()) > 1) {
+ $both_types = $expr_type->getBuilder();
  foreach ($both_types->getAtomicTypes() as $key => $atomic_type) {
  if ($atomic_type->isTruthy()
  || $atomic_type->isFalsy()
  || $atomic_type instanceof TBool) {
  $both_types->removeType($key);
- continue;
  }
-
- $has_both = true;
  }
- }
 
- if ($has_both) {
- $both_types = $both_types->freeze();
- IssueBuffer::maybeAdd(
- new RiskyTruthyFalsyComparison(
- 'Operand of type ' . $expr_type->getId() . ' contains ' .
- 'type' . (count($both_types->getAtomicTypes()) > 1 ? 's' : '') . ' ' .
- $both_types->getId() . ', which can be falsy and truthy. ' .
- 'This can cause possibly unexpected behavior. Use strict comparison instead.',
- new CodeLocation($statements_analyzer, $stmt),
- $expr_type->getId(),
- ),
- $statements_analyzer->getSuppressedIssues(),
- );
+ if (count($both_types->getAtomicTypes()) > 0) {
+ $both_types = $both_types->freeze();
+ IssueBuffer::maybeAdd(
+ new RiskyTruthyFalsyComparison(
+ 'Operand of type ' . $expr_type->getId() . ' contains ' .
+ 'type' . (count($both_types->getAtomicTypes()) > 1 ? 's' : '') . ' ' .
+ $both_types->getId() . ', which can be falsy and truthy. ' .
+ 'This can cause possibly unexpected behavior. Use strict comparison instead.',
+ new CodeLocation($statements_analyzer, $stmt),
+ $expr_type->getId(),
+ ),
+ $statements_analyzer->getSuppressedIssues(),
+ );
+ }
  }
 
  $stmt_type = new TBool();

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/EmptyAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/EmptyAnalyzer.php
@@ -64,34 +64,30 @@ public static function analyze(
  } elseif ($expr_type->isAlwaysFalsy()) {
  $stmt_type = new TTrue($expr_type->from_docblock);
  } else {
- $has_both = false;
- $both_types = $expr_type->getBuilder();
  if (count($expr_type->getAtomicTypes()) > 1) {
+ $both_types = $expr_type->getBuilder();
  foreach ($both_types->getAtomicTypes() as $key => $atomic_type) {
  if ($atomic_type->isTruthy()
  || $atomic_type->isFalsy()
  || $atomic_type instanceof TBool) {
  $both_types->removeType($key);
- continue;
  }
-
- $has_both = true;
  }
- }
 
- if ($has_both) {
- $both_types = $both_types->freeze();
- IssueBuffer::maybeAdd(
- new RiskyTruthyFalsyComparison(
- 'Operand of type ' . $expr_type->getId() . ' contains ' .
- 'type' . (count($both_types->getAtomicTypes()) > 1 ? 's' : '') . ' ' .
- $both_types->getId() . ', which can be falsy and truthy. ' .
- 'This can cause possibly unexpected behavior. Use strict comparison instead.',
- new CodeLocation($statements_analyzer, $stmt),
- $expr_type->getId(),
- ),
- $statements_analyzer->getSuppressedIssues(),
- );
+ if (count($both_types->getAtomicTypes()) > 0) {
+ $both_types = $both_types->freeze();
+ IssueBuffer::maybeAdd(
+ new RiskyTruthyFalsyComparison(
+ 'Operand of type ' . $expr_type->getId() . ' contains ' .
+ 'type' . (count($both_types->getAtomicTypes()) > 1 ? 's' : '') . ' ' .
+ $both_types->getId() . ', which can be falsy and truthy. ' .
+ 'This can cause possibly unexpected behavior. Use strict comparison instead.',
+ new CodeLocation($statements_analyzer, $stmt),
+ $expr_type->getId(),
+ ),
+ $statements_analyzer->getSuppressedIssues(),
+ );
+ }
  }
 
  $stmt_type = new TBool();