simplify

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -6240,26 +6240,25 @@ private function produceArrayDimFetchAssignValueToWrite(array $dimFetchStack, ar
 			}
 		}
 
-		if (count($dimFetchStack) === 1) {
-			$dimFetch = $dimFetchStack[0];
-			if ($dimFetch->dim !== null) {
-				$additionalExpressions[] = [$dimFetch, $originalValueToWrite];
+		$offsetValueType = $valueToWrite;
+		$lastDimKey = array_key_last($dimFetchStack);
+		foreach ($dimFetchStack as $key => $dimFetch) {
+			if ($dimFetch->dim === null) {
+				$additionalExpressions = [];
+				break;
 			}
-		} else {
-			$offsetValueType = $valueToWrite;
-			foreach ($dimFetchStack as $dimFetch) {
-				if ($dimFetch->dim === null) {
-					$additionalExpressions = [];
-					break;
-				}
 
+			if ($key === $lastDimKey) {
+				$offsetValueType = $originalValueToWrite;
+			} else {
 				$offsetType = $scope->getType($dimFetch->dim);
 				$offsetValueType = $offsetValueType->getOffsetValueType($offsetType);
 				if ($offsetValueType instanceof ErrorType) {
 					$offsetValueType = new ConstantArrayType([], []);
 				}
-				$additionalExpressions[] = [$dimFetch, $offsetValueType];
 			}
+
+			$additionalExpressions[] = [$dimFetch, $offsetValueType];
 		}
 
 		return $valueToWrite;

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -1265,4 +1265,9 @@ public function testBug7225(): void
 		$this->analyse([__DIR__ . '/data/bug-7225.php'], []);
 	}
 
+	public function testDeepDimFetch(): void
+	{
+		$this->analyse([__DIR__ . '/data/deep-dim-fetch.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/deep-dim-fetch.php

@@ -0,0 +1,51 @@
+<?php declare(strict_types = 1);
+
+namespace DeepDimFetch;
+
+use function is_callable;
+use function PHPStan\debugScope;
+
+final class NameScope {}
+
+final class FileTypeMapper
+{
+
+	/** @var (true|callable(): NameScope|NameScope)[][] */
+	private array $inProcess = [];
+
+	public function getNameScope(
+		string $fileName,
+		?string $className,
+		?string $traitName,
+		?string $functionName,
+	): NameScope
+	{
+		$nameScopeKey = $this->getNameScopeKey($fileName, $className, $traitName, $functionName);
+		if (!isset($this->inProcess[$fileName][$nameScopeKey])) { // wrong $fileName due to traits
+			throw new \RuntimeException();
+		}
+
+		if ($this->inProcess[$fileName][$nameScopeKey] === true) { // PHPDoc has cyclic dependency
+			throw new \RuntimeException();
+		}
+
+		if (is_callable($this->inProcess[$fileName][$nameScopeKey])) {
+			$resolveCallback = $this->inProcess[$fileName][$nameScopeKey];
+			$this->inProcess[$fileName][$nameScopeKey] = true;
+			$this->inProcess[$fileName][$nameScopeKey] = $resolveCallback();
+		}
+
+		return $this->inProcess[$fileName][$nameScopeKey];
+	}
+
+	private function getNameScopeKey(
+		?string $file,
+		?string $class,
+		?string $trait,
+		?string $function,
+	): string
+	{
+		return '';
+	}
+
+}