Improve

Author: VincentLanglet

src/Analyser/NodeScopeResolver.php

@@ -2094,7 +2094,7 @@ private function processStmtNode(
 					if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
 						$throwPoints = array_merge($throwPoints, $this->processExprNode(
 							$stmt,
-							new MethodCall($this->deepNodeCloner->cloneNode($var->var), 'offsetUnset'),
+							new MethodCall($var->var, 'offsetUnset'),
 							$scope,
 							$storage,
 							new NoopNodeCallback(),
@@ -3629,11 +3629,11 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 			if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
 				$throwPoints = array_merge($throwPoints, $this->processExprNode(
 					$stmt,
-					new MethodCall($this->deepNodeCloner->cloneNode($expr->var), 'offsetGet'),
+					new MethodCall($expr->var, 'offsetGet'),
 					$scope,
 					$storage,
 					new NoopNodeCallback(),
-					ExpressionContext::createDeep(),
+					$context,
 				)->getThrowPoints());
 			}
 		} elseif ($expr instanceof Array_) {
@@ -3945,11 +3945,11 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context, $sto
 
 				$throwPoints = array_merge($throwPoints, $this->processExprNode(
 					$stmt,
-					new MethodCall($this->deepNodeCloner->cloneNode($var->var), 'offsetExists'),
+					new MethodCall($var->var, 'offsetExists'),
 					$scope,
 					$storage,
 					new NoopNodeCallback(),
-					ExpressionContext::createDeep(),
+					$context,
 				)->getThrowPoints());
 			}
 			foreach (array_reverse($expr->vars) as $var) {

tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php

@@ -616,7 +616,24 @@ public function testBug9267(): void
 
 	public function testBug11427(): void
 	{
-		$this->analyse([__DIR__ . '/data/bug-11427.php'], []);
+		$this->analyse([__DIR__ . '/data/bug-11427.php'], [
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				124,
+			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				130,
+			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				136,
+			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				142,
+			],
+		]);
 	}
 
 	#[RequiresPhp('>= 8.4')]

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

@@ -83,3 +83,63 @@ function testArrayOrArrayAccess($c): void {
 		// offsetUnset can throw when $c is C
 	}
 }
+
+class D implements \ArrayAccess {
+	/**
+	 * @throws void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetExists($offset) {
+		throw new \Exception("exists");
+	}
+
+	/**
+	 * @throws void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetGet($offset) {
+		throw new \Exception("get");
+	}
+
+	/**
+	 * @throws void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetSet($offset, $value) {
+		throw new \Exception("set");
+	}
+
+	/**
+	 * @throws void
+	 */
+	#[\ReturnTypeWillChange]
+	public function offsetUnset($offset) {
+		throw new \Exception("unset");
+	}
+}
+
+function test2(D $c): void {
+	try {
+		$x = isset($c[1]);
+	} catch (\Exception $e) {
+		// offsetExists cannot throw
+	}
+
+	try {
+		$x = $c[1];
+	} catch (\Exception $e) {
+		// offsetGet cannot throw
+	}
+
+	try {
+		$c[1] = 1;
+	} catch (\Exception $e) {
+		// offsetSet cannot throw
+	}
+
+	try {
+		unset($c[1]);
+	} catch (\Exception $e) {
+		// offsetUnset cannot throw
+	}
+}