From b5f973f768f2bb55ca4b224a58a05eb5817b2cae Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Wed, 26 Jul 2023 22:18:53 +0700 Subject: [PATCH] [Strict] Skip @return docblock on BooleanInIfConditionRuleFixerRector (#4609) * [Strict] Skip @return docblock on BooleanInIfConditionRuleFixerRector * fix --- .../Fixture/skip_from_return_docblock.php.inc | 24 +++++++++++++++++++ .../BooleanInIfConditionRuleFixerRector.php | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/Fixture/skip_from_return_docblock.php.inc diff --git a/rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/Fixture/skip_from_return_docblock.php.inc b/rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/Fixture/skip_from_return_docblock.php.inc new file mode 100644 index 00000000000..b7bc46820cc --- /dev/null +++ b/rules-tests/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector/Fixture/skip_from_return_docblock.php.inc @@ -0,0 +1,24 @@ +getItems()) { + return true; + } + + return false; + } +} diff --git a/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php b/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php index 107ce1c7c74..7d767a509ca 100644 --- a/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php +++ b/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php @@ -86,7 +86,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?If_ $hasChanged = false; // 1. if - $ifCondExprType = $scope->getType($node->cond); + $ifCondExprType = $scope->getNativeType($node->cond); $notIdentical = $this->exactCompareFactory->createNotIdenticalFalsyCompare( $ifCondExprType, $node->cond, @@ -100,7 +100,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?If_ // 2. elseifs foreach ($node->elseifs as $elseif) { - $elseifCondExprType = $scope->getType($elseif->cond); + $elseifCondExprType = $scope->getNativeType($elseif->cond); $notIdentical = $this->exactCompareFactory->createNotIdenticalFalsyCompare( $elseifCondExprType, $elseif->cond,