Fix isset() with multiple arguments

Fixes phpstan/phpstan#1884
phpstan · Oct 18, 2020 · 1893100 · 1893100
1 parent 5be8b80
commit 1893100
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 26 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1221,36 +1221,25 @@ private function ensureNonNullability(MutatingScope $scope, Expr $expr, bool $fi
 	{
 		$exprToSpecify = $expr;
 		$specifiedExpressions = [];
-		while (
-			$exprToSpecify instanceof PropertyFetch
-			|| $exprToSpecify instanceof StaticPropertyFetch
-			|| (
-				$findMethods && (
-					$exprToSpecify instanceof MethodCall
-					|| $exprToSpecify instanceof StaticCall
-				)
-			)
-		) {
-			if (
-				$exprToSpecify instanceof PropertyFetch
-				|| $exprToSpecify instanceof MethodCall
-			) {
+		while (true) {
+			$exprType = $scope->getType($exprToSpecify);
+			$exprTypeWithoutNull = TypeCombinator::removeNull($exprType);
+			if (!$exprType->equals($exprTypeWithoutNull)) {
+				$specifiedExpressions[] = new EnsuredNonNullabilityResultExpression($exprToSpecify, $exprType);
+				$scope = $scope->specifyExpressionType($exprToSpecify, $exprTypeWithoutNull);
+			}
+
+			if ($exprToSpecify instanceof PropertyFetch) {
+				$exprToSpecify = $exprToSpecify->var;
+			} elseif ($exprToSpecify instanceof StaticPropertyFetch && $exprToSpecify->class instanceof Expr) {
+				$exprToSpecify = $exprToSpecify->class;
+			} elseif ($findMethods && $exprToSpecify instanceof MethodCall) {
 				$exprToSpecify = $exprToSpecify->var;
-			} elseif ($exprToSpecify->class instanceof Expr) {
+			} elseif ($findMethods && $exprToSpecify instanceof StaticCall && $exprToSpecify->class instanceof Expr) {
 				$exprToSpecify = $exprToSpecify->class;
 			} else {
 				break;
 			}
-
-			$exprType = $scope->getType($exprToSpecify);
-			$exprTypeWithoutNull = TypeCombinator::removeNull($exprType);
-			if ($exprType->equals($exprTypeWithoutNull)) {
-				continue;
-			}
-
-			$specifiedExpressions[] = new EnsuredNonNullabilityResultExpression($exprToSpecify, $exprType);
-
-			$scope = $scope->specifyExpressionType($exprToSpecify, $exprTypeWithoutNull);
 		}
 
 		return new EnsuredNonNullabilityResult($scope, $specifiedExpressions);
@@ -1861,15 +1850,19 @@ static function () use ($expr, $rightResult): MutatingScope {
 			$scope = $this->lookForExitVariableAssign($scope, $expr->expr);
 		} elseif ($expr instanceof Expr\Isset_) {
 			$hasYield = false;
+			$nonNullabilityResults = [];
 			foreach ($expr->vars as $var) {
 				$nonNullabilityResult = $this->ensureNonNullability($scope, $var, true);
 				$scope = $this->lookForEnterVariableAssign($nonNullabilityResult->getScope(), $var);
 				$result = $this->processExprNode($var, $scope, $nodeCallback, $context->enterDeep());
 				$scope = $result->getScope();
 				$hasYield = $hasYield || $result->hasYield();
-				$scope = $this->revertNonNullability($scope, $nonNullabilityResult->getSpecifiedExpressions());
+				$nonNullabilityResults[] = $nonNullabilityResult;
 				$scope = $this->lookForExitVariableAssign($scope, $var);
 			}
+			foreach (array_reverse($nonNullabilityResults) as $nonNullabilityResult) {
+				$scope = $this->revertNonNullability($scope, $nonNullabilityResult->getSpecifiedExpressions());
+			}
 		} elseif ($expr instanceof Instanceof_) {
 			$result = $this->processExprNode($expr->expr, $scope, $nodeCallback, $context->enterDeep());
 			$scope = $result->getScope();

diff --git a/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php
@@ -168,6 +168,10 @@ public function testAccessProperties(): void
 					'Cannot access property $selfOrNull on TestAccessProperties\RevertNonNullabilityForIsset|null.',
 					402,
 				],
+				[
+					'Cannot access property $array on stdClass|null.',
+					412,
+				],
 			]
 		);
 	}

diff --git a/tests/PHPStan/Rules/Properties/data/access-properties.php b/tests/PHPStan/Rules/Properties/data/access-properties.php
@@ -403,3 +403,18 @@ public function doFoo()
 	}
 
 }
+
+class Bug1884
+{
+
+	function mustReport(?\stdClass $nullable): bool
+	{
+		return isset($nullable->array['key']);
+	}
+
+	function mustNotReport(?\stdClass $nullable): bool
+	{
+		return isset($nullable, $nullable->array['key']);
+	}
+
+}