Merge branch refs/heads/1.10.x into 1.11.x

Author: phpstan-bot

src/Analyser/NodeScopeResolver.php

@@ -737,7 +737,9 @@ private function processStmtNode(
 			$this->processAttributeGroups($stmt, $stmt->attrGroups, $scope, $nodeCallback);
 
 			foreach ($stmt->props as $prop) {
-				$this->processStmtNode($prop, $scope, $nodeCallback, $context);
+				if ($prop->default !== null) {
+					$this->processExprNode($stmt, $prop->default, $scope, $nodeCallback, ExpressionContext::createDeep());
+				}
 				[,,,,,,,,,,$isReadOnly, $docComment, ,,,$varTags, $isAllowedPrivateMutation] = $this->getPhpDocs($scope, $stmt);
 				if (!$scope->isInClass()) {
 					throw new ShouldNotHappenException();
@@ -773,12 +775,6 @@ private function processStmtNode(
 			if ($stmt->type !== null) {
 				$nodeCallback($stmt->type, $scope);
 			}
-		} elseif ($stmt instanceof Node\Stmt\PropertyProperty) {
-			$hasYield = false;
-			$throwPoints = [];
-			if ($stmt->default !== null) {
-				$this->processExprNode($stmt, $stmt->default, $scope, $nodeCallback, ExpressionContext::createDeep());
-			}
 		} elseif ($stmt instanceof Throw_) {
 			$result = $this->processExprNode($stmt, $stmt->expr, $scope, $nodeCallback, ExpressionContext::createDeep());
 			$throwPoints = $result->getThrowPoints();
@@ -1520,7 +1516,7 @@ private function processStmtNode(
 			$hasYield = false;
 			$throwPoints = [];
 			foreach ($stmt->uses as $use) {
-				$this->processStmtNode($use, $scope, $nodeCallback, $context);
+				$nodeCallback($use, $scope);
 			}
 		} elseif ($stmt instanceof Node\Stmt\Global_) {
 			$hasYield = false;
@@ -1604,14 +1600,11 @@ private function processStmtNode(
 		} elseif ($stmt instanceof Node\Stmt\Nop) {
 			$hasYield = false;
 			$throwPoints = $overridingThrowPoints ?? [];
-		} elseif ($stmt instanceof Node\Stmt\UseUse) {
-			$hasYield = false;
-			$throwPoints = [];
 		} elseif ($stmt instanceof Node\Stmt\GroupUse) {
 			$hasYield = false;
 			$throwPoints = [];
 			foreach ($stmt->uses as $use) {
-				$this->processStmtNode($use, $scope, $nodeCallback, $context);
+				$nodeCallback($use, $scope);
 			}
 		} else {
 			$hasYield = false;