Added regression tests

Author: staabm

src/Rules/Comparison/ConstantConditionRuleHelper.php

@@ -21,6 +21,10 @@ public function __construct(
 
 	public function shouldReportAlwaysTrueByDefault(Expr $expr): bool
 	{
+		if ($expr->getAttribute(LastConditionVisitor::ATTRIBUTE_NAME) === true) {
+			return false;
+		}
+
 		return $expr instanceof Expr\BooleanNot
 			|| $expr instanceof Expr\BinaryOp\BooleanOr
 			|| $expr instanceof Expr\BinaryOp\BooleanAnd

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1149,7 +1149,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8467b.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8442.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/PDOStatement.php');
-		if (PHP_VERSION_ID >= 80000) {
+		if (PHP_VERSION_ID >= 80100) {
 			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Comparison/data/bug-8485.php');
 		}
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/discussion-8447.php');

tests/PHPStan/Rules/Classes/ImpossibleInstanceOfRuleTest.php

@@ -380,13 +380,24 @@ public function testBug8042(): void
 		$this->analyse([__DIR__ . '/data/bug-8042.php'], [
 			[
 				'Instanceof between Bug8042\B and Bug8042\B will always evaluate to true.',
-				18
+				18,
 			],
 			[
 				'Instanceof between Bug8042\B and Bug8042\B will always evaluate to true.',
-				26
+				26,
 			],
 		]);
 	}
 
+	public function testBug7721(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('This test needs PHP 8.1');
+		}
+
+		$this->checkAlwaysTrueInstanceOf = true;
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-7721.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Classes/data/bug-7721.php

@@ -0,0 +1,17 @@
+<?php // lint >= 8.1
+
+namespace Bug7721;
+
+final class A { }
+final class B { }
+final class C
+{
+	public function __construct(public readonly A|B $value) { }
+}
+
+$c = new C(value: new A());
+
+echo match (true) {
+	$c->value instanceof A => 'A',
+	$c->value instanceof B => 'B'
+};

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -653,6 +653,16 @@ public function testBug8586(): void
 		$this->checkAlwaysTrueStrictComparison = true;
 		$this->analyse([__DIR__ . '/data/bug-8586.php'], []);
 	}
+	
+	public function testBug4242(): void
+	{
+		if (PHP_VERSION_ID < 80100) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+
+		$this->checkAlwaysTrueStrictComparison = true;
+		$this->analyse([__DIR__ . '/data/bug-4242.php'], []);
+	}
 
 	public function testBug3633(): void
 	{

tests/PHPStan/Rules/Comparison/data/bug-4242.php

@@ -0,0 +1,101 @@
+<?php // lint >= 8.1
+
+namespace Bug4242;
+
+class Enum
+{
+	public const TYPE_A = 1;
+	public const TYPE_B = 2;
+	public const TYPE_C = 3;
+	public const TYPE_D = 4;
+}
+
+class Data
+{
+	private int $type;
+	private int $someLoad;
+	public function __construct(int $type)
+	{
+		$this->type=$type;
+	}
+	public function getType(): int
+	{
+		return $this->type;
+	}
+	public function someLoad(int $type): self
+	{
+		$this->someLoad=$type;
+		return $this;
+	}
+	public function getSomeLoad(): int
+	{
+		return $this->someLoad;
+	}
+}
+
+class HelloWorld
+{
+	public function case1(): void
+	{
+		$data=(new Data(Enum::TYPE_A));
+		if($data->getType()===Enum::TYPE_A){
+			$data->someLoad(4);
+		}elseif(\in_array($data->getType(), [7,8,9,100], true)){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_B){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_C){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_D){
+			$data->someLoad(6);
+		}else{
+			return;
+		}
+
+
+		if($data->getType()===Enum::TYPE_A){
+			$data->someLoad(4);
+		}elseif(\in_array($data->getType(), [7,8,9,100], true)){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_B){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_C){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_D){ // expected to work without an error
+			$data->someLoad(6);
+		}
+
+	}
+
+	public function case2(): void
+	{
+		$data=(new Data(Enum::TYPE_A));
+		if($data->getType()===Enum::TYPE_A){
+			$data->someLoad(4);
+		}elseif(\in_array($data->getType(), [7,8,9,100], true)){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_B){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_C){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_D){
+			$data->someLoad(6);
+		}else{
+			return;
+		}
+
+		// code above is the same as in case1. code bellow with sorted elseif's
+		if($data->getType()===Enum::TYPE_A){
+			$data->someLoad(4);
+		}elseif($data->getType()===Enum::TYPE_B){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_C){
+			$data->someLoad(6);
+		}elseif($data->getType()===Enum::TYPE_D){
+			$data->someLoad(6);
+		}elseif(\in_array($data->getType(), [7,8,9,100], true)){
+			$data->someLoad(6);
+		}
+
+	}
+}