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

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -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);
 	}