Use param too

Author: VincentLanglet

src/Analyser/ExprHandler/ArrayDimFetchHandler.php

@@ -100,7 +100,11 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
 			$throwPoints = array_merge($throwPoints, $nodeScopeResolver->processExprNode(
 				$stmt,
-				new MethodCall(new TypeExpr($varType), 'offsetGet'),
+				new MethodCall(
+					new TypeExpr($varType),
+					'offsetGet',
+					$expr->dim !== null ? [new Arg(new TypeExpr($scope->getType($expr->dim)))] : [],
+				),
 				$scope,
 				$storage,
 				new NoopNodeCallback(),

src/Analyser/ExprHandler/AssignHandler.php

@@ -5,6 +5,7 @@
 use ArrayAccess;
 use Closure;
 use PhpParser\Node;
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\Assign;
@@ -478,7 +479,11 @@ public function processAssignVar(
 			) {
 				$throwPoints = array_merge($throwPoints, $nodeScopeResolver->processExprNode(
 					$stmt,
-					new MethodCall(new TypeExpr($setVarType), 'offsetSet'),
+					new MethodCall(
+						new TypeExpr($setVarType),
+						'offsetSet',
+						$originalVar->dim !== null ? [new Arg(new TypeExpr($scope->getType($originalVar->dim)))] : []
+					),
 					$scope,
 					$storage,
 					new NoopNodeCallback(),

src/Analyser/ExprHandler/IssetHandler.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Analyser\ExprHandler;
 
 use ArrayAccess;
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\Isset_;
@@ -91,7 +92,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			$isAlwaysTerminating = $isAlwaysTerminating || $result->isAlwaysTerminating();
 			$nonNullabilityResults[] = $nonNullabilityResult;
 
-			if (!($var instanceof ArrayDimFetch)) {
+			if (!($var instanceof ArrayDimFetch) || $var->dim === null) {
 				continue;
 			}
 
@@ -102,7 +103,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 
 			$throwPoints = array_merge($throwPoints, $nodeScopeResolver->processExprNode(
 				$stmt,
-				new MethodCall(new TypeExpr($varType), 'offsetExists'),
+				new MethodCall(new TypeExpr($varType), 'offsetExists', [new Arg(new TypeExpr($scope->getType($var->dim)))]),
 				$scope,
 				$storage,
 				new NoopNodeCallback(),

src/Analyser/NodeScopeResolver.php

@@ -2054,7 +2054,7 @@ public function processStmtNode(
 					if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
 						$throwPoints = array_merge($throwPoints, $this->processExprNode(
 							$stmt,
-							new MethodCall(new TypeExpr($varType), 'offsetUnset'),
+							new MethodCall(new TypeExpr($varType), 'offsetUnset', [new Arg(new TypeExpr($scope->getType($var->dim)))]),
 							$scope,
 							$storage,
 							new NoopNodeCallback(),