Fix integer range pow issues

Author: schlndh

src/Type/TypeCombinator.php

@@ -37,6 +37,8 @@
 use function md5;
 use function sprintf;
 use function usort;
+use const PHP_INT_MAX;
+use const PHP_INT_MIN;
 
 /**
  * @api
@@ -185,6 +187,7 @@ public static function union(Type ...$types): Type
 		$scalarTypes = [];
 		$hasGenericScalarTypes = [];
 		$enumCaseTypes = [];
+		$integerRangeTypes = [];
 		for ($i = 0; $i < $typesCount; $i++) {
 			if ($types[$i] instanceof ConstantScalarType) {
 				$type = $types[$i];
@@ -212,6 +215,13 @@ public static function union(Type ...$types): Type
 				continue;
 			}
 
+			if ($types[$i] instanceof IntegerRangeType) {
+				$integerRangeTypes[] = $types[$i];
+				unset($types[$i]);
+
+				continue;
+			}
+
 			if (!$types[$i]->isArray()->yes()) {
 				continue;
 			}
@@ -225,6 +235,12 @@ public static function union(Type ...$types): Type
 		}
 
 		$enumCaseTypes = array_values($enumCaseTypes);
+		usort(
+			$integerRangeTypes,
+			static fn (IntegerRangeType $a, IntegerRangeType $b): int => ($a->getMin() ?? PHP_INT_MIN) <=> ($b->getMin() ?? PHP_INT_MIN)
+				?: ($a->getMax() ?? PHP_INT_MAX) <=> ($b->getMax() ?? PHP_INT_MAX)
+		);
+		$types = array_merge($types, $integerRangeTypes);
 		$types = array_values($types);
 		$typesCount = count($types);
 

tests/PHPStan/Analyser/nsrt/pow.php

@@ -47,11 +47,11 @@ function (): void {
 		$x = 4;
 	}
 
-	assertType('int<4, 27>|int<16, 81>', pow($range, $x));
-	assertType('int<4, 27>|int<16, 81>', $range ** $x);
+	assertType('int<4, 81>', pow($range, $x));
+	assertType('int<4, 81>', $range ** $x);
 
-	assertType('int<4, 27>|int<16, 64>', pow($x, $range));
-	assertType('int<4, 27>|int<16, 64>', $x ** $range);
+	assertType('int<4, 64>', pow($x, $range));
+	assertType('int<4, 64>', $x ** $range);
 
 	assertType('int<4, 27>', pow($range, $range));
 	assertType('int<4, 27>', $range ** $range);

tests/PHPStan/Rules/Comparison/BooleanAndConstantConditionRuleTest.php

@@ -433,4 +433,10 @@ public function testBug5365(): void
 		$this->analyse([__DIR__ . '/data/bug-5365.php'], []);
 	}
 
+	public function testBug8555(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-8555.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Comparison/BooleanNotConstantConditionRuleTest.php

@@ -146,6 +146,12 @@ public function testBug8797(): void
 		$this->analyse([__DIR__ . '/data/bug-8797.php'], []);
 	}
 
+	public function testBug7937(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-7937.php'], []);
+	}
+
 	public function dataReportAlwaysTrueInLastCondition(): iterable
 	{
 		yield [false, [

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

@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+
+namespace Bug7937;
+
+class HelloWorld
+{
+	public function f(int $a, int $b)
+	{
+		if (!$a && !$b) {
+			return "";
+		}
+
+		$output = " ";
+
+		if ($a) {
+			$output .= "$a";
+		}
+
+		\PHPStan\dumpType($a);
+
+		if ($b) {
+			\PHPStan\dumpType($a);
+
+			if (!$a) {
+				$output .= "_";
+			}
+		}
+
+		return $output;
+	}
+}

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

@@ -0,0 +1,14 @@
+<?php
+
+namespace Bug8555;
+
+/**
+ * @return array<string, int|null>
+ */
+function test(int $first, int $second): array
+{
+	return [
+		'test' => $first && $second ? $first : null,
+		'test2' => $first && $second ? $first : null,
+	];
+}

tests/PHPStan/Type/TypeCombinatorTest.php

@@ -1560,6 +1560,34 @@ public function dataUnion(): iterable
 				UnionType::class,
 				'int<1, 3>|int<7, 9>',
 			],
+			[
+				[
+					IntegerRangeType::fromInterval(4, 9),
+					IntegerRangeType::fromInterval(16, 81),
+					IntegerRangeType::fromInterval(8, 27),
+				],
+				IntegerRangeType::class,
+				'int<4, 81>',
+			],
+			[
+				[
+					IntegerRangeType::fromInterval(8, 27),
+					IntegerRangeType::fromInterval(4, 6),
+					new ConstantIntegerType(7),
+					IntegerRangeType::fromInterval(16, 81),
+				],
+				IntegerRangeType::class,
+				'int<4, 81>',
+			],
+			[
+				[
+					new IntegerType(),
+					IntegerRangeType::fromInterval(null, -1),
+					IntegerRangeType::fromInterval(1, null),
+				],
+				IntegerType::class,
+				'int',
+			],
 			[
 				[
 					IntegerRangeType::fromInterval(1, 3),