Merge branch 'phpstan:2.2.x' into 2.2.x

Author: staabm

compiler/composer.json

@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.2",
         "nette/neon": "^3.0.0",
-        "ondrejmirtes/simple-downgrader": "^2.2.3",
+        "ondrejmirtes/simple-downgrader": "^2.2.5",
         "seld/phar-utils": "^1.2",
         "symfony/console": "^5.4.43",
         "symfony/filesystem": "^5.4.43",

compiler/composer.lock

@@ -15,7 +15,7 @@
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/file": "1.17.07.11",
-		"jetbrains/phpstorm-stubs": "dev-master#2cdd054c4109dfb76667c9198bf9427606354243",
+		"jetbrains/phpstorm-stubs": "dev-master#089eb05b06ff1947677b765f9f14ad1d6b6b8af5",
 		"nette/bootstrap": "^3.0",
 		"nette/di": "^3.1.4",
 		"nette/neon": "3.3.4",

composer.json

@@ -1731,12 +1731,6 @@ parameters:
 			count: 1
 			path: src/Type/TypeCombinator.php
 
-		-
-			rawMessage: 'Doing instanceof PHPStan\Type\Constant\ConstantArrayType is error-prone and deprecated. Use Type::getConstantArrays() instead.'
-			identifier: phpstanApi.instanceofType
-			count: 2
-			path: src/Type/TypeUtils.php
-
 		-
 			rawMessage: Doing instanceof PHPStan\Type\IntersectionType is error-prone and deprecated.
 			identifier: phpstanApi.instanceofType

composer.lock

@@ -1467,8 +1467,6 @@ private function resolveType(string $exprString, Expr $node): Type
 				$node->var,
 				$this->getTypeFromArrayDimFetch(
 					$node,
-					$this->getType($node->dim),
-					$this->getType($node->var),
 				),
 			);
 		}
@@ -1845,14 +1843,13 @@ private function promoteNativeTypes(): self
 
 	private function getTypeFromArrayDimFetch(
 		Expr\ArrayDimFetch $arrayDimFetch,
-		Type $offsetType,
-		Type $offsetAccessibleType,
 	): Type
 	{
 		if ($arrayDimFetch->dim === null) {
 			throw new ShouldNotHappenException();
 		}
 
+		$offsetAccessibleType = $this->getType($arrayDimFetch->var);
 		if ($offsetAccessibleType instanceof NeverType) {
 			return $offsetAccessibleType;
 		}
@@ -1872,6 +1869,7 @@ private function getTypeFromArrayDimFetch(
 			);
 		}
 
+		$offsetType = $this->getType($arrayDimFetch->dim);
 		return $offsetAccessibleType->getOffsetValueType($offsetType);
 	}
 
@@ -4143,17 +4141,21 @@ private function createConditionalExpressions(
 				continue;
 			}
 
-			$conditionalExpression = new ConditionalExpressionHolder($variableTypeGuards, $holder);
-			$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			foreach ($variableTypeGuards as $guardExprString => $guardHolder) {
+				$conditionalExpression = new ConditionalExpressionHolder([$guardExprString => $guardHolder], $holder);
+				$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			}
 		}
 
 		foreach ($mergedExpressionTypes as $exprString => $mergedExprTypeHolder) {
 			if (array_key_exists($exprString, $ourExpressionTypes)) {
 				continue;
 			}
 
-			$conditionalExpression = new ConditionalExpressionHolder($typeGuards, new ExpressionTypeHolder($mergedExprTypeHolder->getExpr(), new ErrorType(), TrinaryLogic::createNo()));
-			$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			foreach ($typeGuards as $guardExprString => $guardHolder) {
+				$conditionalExpression = new ConditionalExpressionHolder([$guardExprString => $guardHolder], new ExpressionTypeHolder($mergedExprTypeHolder->getExpr(), new ErrorType(), TrinaryLogic::createNo()));
+				$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			}
 		}
 
 		return $conditionalExpressions;

phpstan-baseline.neon

@@ -148,4 +148,25 @@ public function getChangedProjectExtensionFilesOutsideOfAnalysedPaths(): array
 		return $this->changedProjectExtensionFilesOutsideOfAnalysedPaths;
 	}
 
+	/**
+	 * @api
+	 * @param list<Error> $fileSpecificErrors
+	 */
+	public function withFileSpecificErrors(array $fileSpecificErrors): self
+	{
+		return new self(
+			$fileSpecificErrors,
+			$this->notFileSpecificErrors,
+			$this->internalErrors,
+			$this->warnings,
+			$this->collectedData,
+			$this->defaultLevelUsed,
+			$this->projectConfigFile,
+			$this->savedResultCache,
+			$this->peakMemoryUsageBytes,
+			$this->isResultCacheUsed,
+			$this->changedProjectExtensionFilesOutsideOfAnalysedPaths,
+		);
+	}
+
 }

src/Analyser/MutatingScope.php

@@ -2,14 +2,15 @@
 
 namespace PHPStan\Internal;
 
+use Traversable;
 use function array_pop;
 
 final class CombinationsHelper
 {
 
 	/**
 	 * @param array<iterable<mixed>> $arrays
-	 * @return iterable<list<mixed>>
+	 * @return Traversable<list<mixed>>
 	 */
 	public static function combinations(array $arrays): iterable
 	{

src/Command/AnalysisResult.php

@@ -216,6 +216,8 @@ public function getAllArrays(): array
 		} else {
 			$optionalKeysCombinations = [
 				[],
+				array_slice($this->optionalKeys, 0, 1, true),
+				array_slice($this->optionalKeys, -1, 1, true),
 				$this->optionalKeys,
 			];
 		}