Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -5138,7 +5138,10 @@ private static function generalizeType(Type $a, Type $b, int $depth): Type
 			} else {
 				$constantArraysA = TypeCombinator::union(...$constantArrays['a']);
 				$constantArraysB = TypeCombinator::union(...$constantArrays['b']);
-				if ($constantArraysA->getIterableKeyType()->equals($constantArraysB->getIterableKeyType())) {
+				if (
+					$constantArraysA->getIterableKeyType()->equals($constantArraysB->getIterableKeyType())
+					&& $constantArraysA->getArraySize()->equals($constantArraysB->getArraySize())
+				) {
 					$resultArrayBuilder = ConstantArrayTypeBuilder::createEmpty();
 					foreach (TypeUtils::flattenTypes($constantArraysA->getIterableKeyType()) as $keyType) {
 						$resultArrayBuilder->setOffsetValueType(
@@ -5158,7 +5161,11 @@ private static function generalizeType(Type $a, Type $b, int $depth): Type
 						TypeCombinator::union(self::generalizeType($constantArraysA->getIterableKeyType(), $constantArraysB->getIterableKeyType(), $depth + 1)),
 						TypeCombinator::union(self::generalizeType($constantArraysA->getIterableValueType(), $constantArraysB->getIterableValueType(), $depth + 1)),
 					);
-					if ($constantArraysA->isIterableAtLeastOnce()->yes() && $constantArraysB->isIterableAtLeastOnce()->yes()) {
+					if (
+						$constantArraysA->isIterableAtLeastOnce()->yes()
+						&& $constantArraysB->isIterableAtLeastOnce()->yes()
+						&& $constantArraysA->getArraySize()->getGreaterOrEqualType()->isSuperTypeOf($constantArraysB->getArraySize())->yes()
+					) {
 						$resultType = TypeCombinator::intersect($resultType, new NonEmptyArrayType());
 					}
 					if ($constantArraysA->isList()->yes() && $constantArraysB->isList()->yes()) {

tests/PHPStan/Analyser/nsrt/bug-1021.php

@@ -13,7 +13,7 @@ function foobar() {
 		}
 	}
 
-	assertType('array{0?: int<1, max>, 1?: 2|3, 2?: 3}', $x);
+	assertType('array<1|2|3>&list', $x);
 
 	if ($x) {
 	}

tests/PHPStan/Analyser/nsrt/bug7856.php

@@ -10,7 +10,7 @@ function doFoo() {
 	$endDate = new DateTimeImmutable('+1year');
 
 	do {
-		assertType("array{'+1week', '+1months', '+6months', '+17months'}|array{0: literal-string&lowercase-string&non-falsy-string, 1?: literal-string&lowercase-string&non-falsy-string, 2?: '+17months'}", $intervals);
+		assertType("list<literal-string&lowercase-string&non-falsy-string>", $intervals);
 		$periodEnd = $periodEnd->modify(array_shift($intervals));
 	} while (count($intervals) > 0 && $periodEnd->format('U') < $endDate);
 }

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -736,6 +736,12 @@ public function testLastMatchArm(bool $reportAlwaysTrueInLastCondition, array $e
 		$this->analyse([__DIR__ . '/data/strict-comparison-last-match-arm.php'], $expectedErrors);
 	}
 
+	public function testBug8030(): void
+	{
+		$this->checkAlwaysTrueStrictComparison = true;
+		$this->analyse([__DIR__ . '/data/bug-8030.php'], []);
+	}
+
 	public function testBug8776Part1(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-8776-1.php'], []);

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace Bug8030;
+
+function (): ?string
+{
+	$refs = range('a', 'e');
+
+	while (null !== $ref = array_shift($refs)) {
+		if (random_int(0, 1) === 1) {
+			return $ref;
+		}
+	}
+
+	return null;
+};

tests/PHPStan/Rules/Variables/EmptyRuleTest.php

@@ -199,4 +199,12 @@ public function testBug9403(bool $treatPhpDocTypesAsCertain): void
 		$this->analyse([__DIR__ . '/data/bug-9403.php'], []);
 	}
 
+	public function testBug12658(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->strictUnnecessaryNullsafePropertyFetch = false;
+
+		$this->analyse([__DIR__ . '/data/bug-12658.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Variables/data/bug-12658.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+
+namespace Bug12658;
+
+function (): void {
+	$ads = ['inline_1', 'inline_2', 'inline_3', 'inline_4'];
+	$paragraphs = ['a', 'b', 'c', 'd', 'f'];
+
+	foreach ($paragraphs as $key => $paragraph) {
+		if (!empty($ads)) {
+			$ad = array_shift($ads);
+		}
+	}
+};