Fix build after merge

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -4920,7 +4920,7 @@ public function processClosureScope(
 				$prevVariableType = $prevScope->getVariableType($variableName);
 				if (!$variableType->equals($prevVariableType)) {
 					$variableType = TypeCombinator::union($variableType, $prevVariableType);
-					$variableType = self::generalizeType($variableType, $prevVariableType, 0);
+					$variableType = $this->generalizeType($variableType, $prevVariableType, 0);
 				}
 			}
 
@@ -5045,15 +5045,15 @@ private function generalizeVariableTypeHolders(
 
 			$variableTypeHolders[$variableExprString] = new ExpressionTypeHolder(
 				$variableTypeHolder->getExpr(),
-				self::generalizeType($variableTypeHolder->getType(), $otherVariableTypeHolders[$variableExprString]->getType(), 0),
+				$this->generalizeType($variableTypeHolder->getType(), $otherVariableTypeHolders[$variableExprString]->getType(), 0),
 				$variableTypeHolder->getCertainty(),
 			);
 		}
 
 		return $variableTypeHolders;
 	}
 
-	private static function generalizeType(Type $a, Type $b, int $depth): Type
+	private function generalizeType(Type $a, Type $b, int $depth): Type
 	{
 		if ($a->equals($b)) {
 			return $a;
@@ -5146,7 +5146,7 @@ private static function generalizeType(Type $a, Type $b, int $depth): Type
 					foreach (TypeUtils::flattenTypes($constantArraysA->getIterableKeyType()) as $keyType) {
 						$resultArrayBuilder->setOffsetValueType(
 							$keyType,
-							self::generalizeType(
+							$this->generalizeType(
 								$constantArraysA->getOffsetValueType($keyType),
 								$constantArraysB->getOffsetValueType($keyType),
 								$depth + 1,
@@ -5158,13 +5158,13 @@ private static function generalizeType(Type $a, Type $b, int $depth): Type
 					$resultTypes[] = $resultArrayBuilder->getArray();
 				} else {
 					$resultType = new ArrayType(
-						TypeCombinator::union(self::generalizeType($constantArraysA->getIterableKeyType(), $constantArraysB->getIterableKeyType(), $depth + 1)),
-						TypeCombinator::union(self::generalizeType($constantArraysA->getIterableValueType(), $constantArraysB->getIterableValueType(), $depth + 1)),
+						TypeCombinator::union($this->generalizeType($constantArraysA->getIterableKeyType(), $constantArraysB->getIterableKeyType(), $depth + 1)),
+						TypeCombinator::union($this->generalizeType($constantArraysA->getIterableValueType(), $constantArraysB->getIterableValueType(), $depth + 1)),
 					);
 					if (
 						$constantArraysA->isIterableAtLeastOnce()->yes()
 						&& $constantArraysB->isIterableAtLeastOnce()->yes()
-						&& $constantArraysA->getArraySize()->getGreaterOrEqualType()->isSuperTypeOf($constantArraysB->getArraySize())->yes()
+						&& $constantArraysA->getArraySize()->getGreaterOrEqualType($this->phpVersion)->isSuperTypeOf($constantArraysB->getArraySize())->yes()
 					) {
 						$resultType = TypeCombinator::intersect($resultType, new NonEmptyArrayType());
 					}
@@ -5205,8 +5205,8 @@ private static function generalizeType(Type $a, Type $b, int $depth): Type
 				}
 
 				$resultType = new ArrayType(
-					TypeCombinator::union(self::generalizeType($generalArraysA->getIterableKeyType(), $generalArraysB->getIterableKeyType(), $depth + 1)),
-					TypeCombinator::union(self::generalizeType($aValueType, $bValueType, $depth + 1)),
+					TypeCombinator::union($this->generalizeType($generalArraysA->getIterableKeyType(), $generalArraysB->getIterableKeyType(), $depth + 1)),
+					TypeCombinator::union($this->generalizeType($aValueType, $bValueType, $depth + 1)),
 				);
 				if ($generalArraysA->isIterableAtLeastOnce()->yes() && $generalArraysB->isIterableAtLeastOnce()->yes()) {
 					$resultType = TypeCombinator::intersect($resultType, new NonEmptyArrayType());

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

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

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -738,7 +738,6 @@ public function testLastMatchArm(bool $reportAlwaysTrueInLastCondition, array $e
 
 	public function testBug8030(): void
 	{
-		$this->checkAlwaysTrueStrictComparison = true;
 		$this->analyse([__DIR__ . '/data/bug-8030.php'], []);
 	}
 

tests/PHPStan/Rules/Variables/EmptyRuleTest.php

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