Check for boolean in while conditions

rules.neon

@@ -64,12 +64,16 @@ conditionalTags:
 		phpstan.rules.rule: %strictRules.booleansInConditions%
 	PHPStan\Rules\BooleansInConditions\BooleanInBooleanOrRule:
 		phpstan.rules.rule: %strictRules.booleansInConditions%
+	PHPStan\Rules\BooleansInConditions\BooleanInDoWhileConditionRule:
+		phpstan.rules.rule: %strictRules.booleansInConditions%
 	PHPStan\Rules\BooleansInConditions\BooleanInElseIfConditionRule:
 		phpstan.rules.rule: %strictRules.booleansInConditions%
 	PHPStan\Rules\BooleansInConditions\BooleanInIfConditionRule:
 		phpstan.rules.rule: %strictRules.booleansInConditions%
 	PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule:
 		phpstan.rules.rule: %strictRules.booleansInConditions%
+	PHPStan\Rules\BooleansInConditions\BooleanInWhileConditionRule:
+		phpstan.rules.rule: %strictRules.booleansInConditions%
 	PHPStan\Rules\Cast\UselessCastRule:
 		phpstan.rules.rule: %strictRules.uselessCast%
 	PHPStan\Rules\Classes\RequireParentConstructCallRule:
@@ -163,6 +167,9 @@ services:
 	-
 		class: PHPStan\Rules\BooleansInConditions\BooleanInBooleanOrRule
 
+	-
+		class: PHPStan\Rules\BooleansInConditions\BooleanInDoWhileConditionRule
+
 	-
 		class: PHPStan\Rules\BooleansInConditions\BooleanInElseIfConditionRule
 
@@ -172,6 +179,9 @@ services:
 	-
 		class: PHPStan\Rules\BooleansInConditions\BooleanInTernaryOperatorRule
 
+	-
+		class: PHPStan\Rules\BooleansInConditions\BooleanInWhileConditionRule
+
 	-
 		class: PHPStan\Rules\Cast\UselessCastRule
 		arguments:

src/Rules/BooleansInConditions/BooleanInDoWhileConditionRule.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\BooleansInConditions;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Do_;
+use PHPStan\Analyser\Scope;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\VerbosityLevel;
+use function sprintf;
+
+/**
+ * @implements Rule<Do_>
+ */
+class BooleanInDoWhileConditionRule implements Rule
+{
+
+	private BooleanRuleHelper $helper;
+
+	public function __construct(BooleanRuleHelper $helper)
+	{
+		$this->helper = $helper;
+	}
+
+	public function getNodeType(): string
+	{
+		return Do_::class;
+	}
+
+	public function processNode(Node $node, Scope $scope): array
+	{
+		if ($this->helper->passesAsBoolean($scope, $node->cond)) {
+			return [];
+		}
+
+		$conditionExpressionType = $scope->getType($node->cond);
+
+		return [
+			RuleErrorBuilder::message(sprintf(
+				'Only booleans are allowed in a do-while condition, %s given.',
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly()),
+			))->identifier('doWhile.condNotBoolean')->build(),
+		];
+	}
+
+}

src/Rules/BooleansInConditions/BooleanInWhileConditionRule.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\BooleansInConditions;
+
+use PhpParser\Node;
+use PhpParser\Node\Stmt\While_;
+use PHPStan\Analyser\Scope;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\VerbosityLevel;
+use function sprintf;
+
+/**
+ * @implements Rule<While_>
+ */
+class BooleanInWhileConditionRule implements Rule
+{
+
+	private BooleanRuleHelper $helper;
+
+	public function __construct(BooleanRuleHelper $helper)
+	{
+		$this->helper = $helper;
+	}
+
+	public function getNodeType(): string
+	{
+		return While_::class;
+	}
+
+	public function processNode(Node $node, Scope $scope): array
+	{
+		if ($this->helper->passesAsBoolean($scope, $node->cond)) {
+			return [];
+		}
+
+		$conditionExpressionType = $scope->getType($node->cond);
+
+		return [
+			RuleErrorBuilder::message(sprintf(
+				'Only booleans are allowed in a while condition, %s given.',
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly()),
+			))->identifier('while.condNotBoolean')->build(),
+		];
+	}
+
+}

tests/Rules/BooleansInConditions/BooleanInDoWhileConditionRuleTest.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types = 1);
+
+namespace Rules\BooleansInConditions;
+
+use PHPStan\Rules\BooleansInConditions\BooleanInDoWhileConditionRule;
+use PHPStan\Rules\BooleansInConditions\BooleanRuleHelper;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleLevelHelper;
+use PHPStan\Testing\RuleTestCase;
+
+/**
+ * @extends RuleTestCase<BooleanInDoWhileConditionRule>
+ */
+class BooleanInDoWhileConditionRuleTest extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return new BooleanInDoWhileConditionRule(
+			new BooleanRuleHelper(
+				self::getContainer()->getByType(RuleLevelHelper::class),
+			),
+		);
+	}
+
+	public function testRule(): void
+	{
+		$this->analyse([__DIR__ . '/data/conditions.php'], [
+			[
+				'Only booleans are allowed in a do-while condition, string given.',
+				60,
+			],
+		]);
+	}
+
+}

tests/Rules/BooleansInConditions/BooleanInWhileConditionRuleTest.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types = 1);
+
+namespace Rules\BooleansInConditions;
+
+use PHPStan\Rules\BooleansInConditions\BooleanInWhileConditionRule;
+use PHPStan\Rules\BooleansInConditions\BooleanRuleHelper;
+use PHPStan\Rules\Rule;
+use PHPStan\Rules\RuleLevelHelper;
+use PHPStan\Testing\RuleTestCase;
+
+/**
+ * @extends RuleTestCase<BooleanInWhileConditionRule>
+ */
+class BooleanInWhileConditionRuleTest extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return new BooleanInWhileConditionRule(
+			new BooleanRuleHelper(
+				self::getContainer()->getByType(RuleLevelHelper::class),
+			),
+		);
+	}
+
+	public function testRule(): void
+	{
+		$this->analyse([__DIR__ . '/data/conditions.php'], [
+			[
+				'Only booleans are allowed in a while condition, string given.',
+				55,
+			],
+		]);
+	}
+
+}

tests/Rules/BooleansInConditions/data/conditions.php

@@ -48,3 +48,13 @@
 $explicitMixed and $bool;
 $bool or $explicitMixed;
 $explicitMixed or $bool;
+
+$someBool = true;
+$someString = 'string';
+while ($someBool) { $someBool = !$someBool; }
+while ($someString) { $someString = ''; }
+
+$someBool = true;
+$someString = 'string';
+do { $someBool = !$someBool; } while ($someBool);
+do { $someString = ''; } while ($someString);