Improve

Author: VincentLanglet

src/Analyser/NodeScopeResolver.php

@@ -6414,10 +6414,11 @@ private function processAssignVar(
 				$scope = $scope->assignExpression($expr, $type, $nativeType);
 			}
 
-			if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
+			$setVarType = $scope->getType($originalVar->var);
+			if (!$setVarType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($setVarType)->no()) {
 				$throwPoints = array_merge($throwPoints, $this->processExprNode(
 					$stmt,
-					new MethodCall($var, 'offsetSet'),
+					new MethodCall($originalVar->var, 'offsetSet'),
 					$scope,
 					$storage,
 					new NoopNodeCallback(),

tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php

@@ -633,6 +633,22 @@ public function testBug11427(): void
 				'Dead catch - Exception is never thrown in the try block.',
 				142,
 			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				183,
+			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				189,
+			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				197,
+			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				203,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Exceptions/data/bug-11427.php

@@ -143,3 +143,64 @@ function test2(D $c): void {
 		// offsetUnset cannot throw
 	}
 }
+
+/**
+ * @param array<C> $arrayOfC
+ */
+function test3(array $arrayOfC): void
+{
+	try {
+		$x = isset($arrayOfC[0][1]);
+	} catch (\Exception $e) {
+		// offsetExists can throw
+	}
+
+	try {
+		$x = $arrayOfC[0][1];
+	} catch (\Exception $e) {
+		// offsetGet can throw
+	}
+
+	try {
+		$arrayOfC[0][1] = 1;
+	} catch (\Exception $e) {
+		// offsetSet can throw
+	}
+
+	try {
+		unset($arrayOfC[0][1]);
+	} catch (\Exception $e) {
+		// offsetUnset can throw
+	}
+}
+
+/**
+ * @param array<C> $arrayOfC
+ */
+function test4(array $arrayOfC): void {
+	try {
+		$x = isset($arrayOfC[0]);
+	} catch (\Exception $e) {
+		// offsetExists cannot throw
+	}
+
+	try {
+		$x = $arrayOfC[0];
+	} catch (\Exception $e) {
+		// offsetGet cannot throw
+	}
+
+	/** @var C<int, int> $newC */
+	$newC = new C();
+	try {
+		$arrayOfC[0] = $newC;
+	} catch (\Exception $e) {
+		// offsetSet cannot throw
+	}
+
+	try {
+		unset($arrayOfC[0]);
+	} catch (\Exception $e) {
+		// offsetUnset cannot throw
+	}
+}