IssetCheck - respect treatPhpDocTypesAsCertain in more places

ondrejmirtes · ondrejmirtes · commit 49d2aa6fd020 · 2023-04-01T10:35:10.000+02:00
diff --git a/src/Rules/IssetCheck.php b/src/Rules/IssetCheck.php
@@ -191,7 +191,7 @@ public function check(Expr $expr, Scope $scope, string $operatorDescription, cal
 			return null;
 		}
 
-		$error = $this->generateError($scope->getType($expr), sprintf('Expression %s', $operatorDescription), $typeMessageCallback);
+		$error = $this->generateError($this->treatPhpDocTypesAsCertain ? $scope->getType($expr) : $scope->getNativeType($expr), sprintf('Expression %s', $operatorDescription), $typeMessageCallback);
 		if ($error !== null) {
 			return $error;
 		}
@@ -223,8 +223,8 @@ private function checkUndefined(Expr $expr, Scope $scope, string $operatorDescri
 		}
 
 		if ($expr instanceof Node\Expr\ArrayDimFetch && $expr->dim !== null) {
-			$type = $scope->getType($expr->var);
-			$dimType = $scope->getType($expr->dim);
+			$type = $this->treatPhpDocTypesAsCertain ? $scope->getType($expr->var) : $scope->getNativeType($expr->var);
+			$dimType = $this->treatPhpDocTypesAsCertain ? $scope->getType($expr->dim) : $scope->getNativeType($expr->dim);
 			$hasOffsetValue = $type->hasOffsetValueType($dimType);
 			if (!$type->isOffsetAccessible()->yes()) {
 				return $this->checkUndefined($expr->var, $scope, $operatorDescription);

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public function check(Expr $expr, Scope $scope, string $operatorDescription, cal`
`191`	`191`	`return null;`
`192`	`192`	`}`
`193`	`193`
`194`		`- $error = $this->generateError($scope->getType($expr), sprintf('Expression %s', $operatorDescription), $typeMessageCallback);`
	`194`	`+ $error = $this->generateError($this->treatPhpDocTypesAsCertain ? $scope->getType($expr) : $scope->getNativeType($expr), sprintf('Expression %s', $operatorDescription), $typeMessageCallback);`
`195`	`195`	`if ($error !== null) {`
`196`	`196`	`return $error;`
`197`	`197`	`}`
`@@ -223,8 +223,8 @@ private function checkUndefined(Expr $expr, Scope $scope, string $operatorDescri`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`if ($expr instanceof Node\Expr\ArrayDimFetch && $expr->dim !== null) {`
`226`		`- $type = $scope->getType($expr->var);`
`227`		`- $dimType = $scope->getType($expr->dim);`
	`226`	`+ $type = $this->treatPhpDocTypesAsCertain ? $scope->getType($expr->var) : $scope->getNativeType($expr->var);`
	`227`	`+ $dimType = $this->treatPhpDocTypesAsCertain ? $scope->getType($expr->dim) : $scope->getNativeType($expr->dim);`
`228`	`228`	`$hasOffsetValue = $type->hasOffsetValueType($dimType);`
`229`	`229`	`if (!$type->isOffsetAccessible()->yes()) {`
`230`	`230`	`return $this->checkUndefined($expr->var, $scope, $operatorDescription);`