Update PHP-Parser and BetterReflection

composer.json

@@ -15,16 +15,16 @@
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/file": "1.17.07.11",
-		"jetbrains/phpstorm-stubs": "dev-master#db675e059f57071e8209c99075128b92d8a727e7",
+		"jetbrains/phpstorm-stubs": "dev-master#dfcad4524db603bd20bdec3aab1a31c5f5128ea3",
 		"nette/bootstrap": "^3.0",
 		"nette/di": "^3.1.4",
 		"nette/neon": "3.3.4",
 		"nette/php-generator": "3.6.9",
 		"nette/schema": "^1.2.2",
 		"nette/utils": "^3.2.5",
-		"nikic/php-parser": "^5.3.0",
+		"nikic/php-parser": "^5.4.0",
 		"ondram/ci-detector": "^3.4.0",
-		"ondrejmirtes/better-reflection": "6.49.0.0",
+		"ondrejmirtes/better-reflection": "6.51.0.1",
 		"phpstan/php-8-stubs": "0.4.9",
 		"phpstan/phpdoc-parser": "2.0.0",
 		"psr/http-message": "^1.1",

conf/config.level3.neon

@@ -22,7 +22,6 @@ rules:
 	- PHPStan\Rules\Properties\ReadOnlyPropertyAssignRefRule
 	- PHPStan\Rules\Properties\ReadOnlyByPhpDocPropertyAssignRefRule
 	- PHPStan\Rules\Properties\SetNonVirtualPropertyHookAssignRule
-	- PHPStan\Rules\Properties\ShortGetPropertyHookReturnTypeRule
 	- PHPStan\Rules\Properties\TypesAssignedToPropertiesRule
 	- PHPStan\Rules\Variables\ParameterOutAssignedTypeRule
 	- PHPStan\Rules\Variables\ParameterOutExecutionEndTypeRule

conf/config.neon

@@ -320,11 +320,6 @@ services:
 		tags:
 			- phpstan.parser.richParserNodeVisitor
 
-	-
-		class: PHPStan\Parser\PropertyHookNameVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
-
 	-
 		class: PHPStan\Node\Printer\ExprPrinter
 

src/Analyser/NodeScopeResolver.php

@@ -124,8 +124,8 @@
 use PHPStan\Parser\ArrowFunctionArgVisitor;
 use PHPStan\Parser\ClosureArgVisitor;
 use PHPStan\Parser\ImmediatelyInvokedClosureVisitor;
+use PHPStan\Parser\LineAttributesVisitor;
 use PHPStan\Parser\Parser;
-use PHPStan\Parser\PropertyHookNameVisitor;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\PhpDocInheritanceResolver;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
@@ -4830,54 +4830,61 @@ private function processPropertyHooks(
 				$hook,
 			), $hookScope);
 
+			$stmts = $hook->getStmts();
+			if ($stmts === null) {
+				return;
+			}
+
 			if ($hook->body instanceof Expr) {
-				$this->processExprNode($stmt, $hook->body, $hookScope, $nodeCallback, ExpressionContext::createTopLevel());
-				$nodeCallback(new PropertyAssignNode(new PropertyFetch(new Variable('this'), $propertyName, $hook->body->getAttributes()), $hook->body, false), $hookScope);
-			} elseif (is_array($hook->body)) {
-				$gatheredReturnStatements = [];
-				$executionEnds = [];
-				$methodImpurePoints = [];
-				$statementResult = $this->processStmtNodes(new PropertyHookStatementNode($hook), $hook->body, $hookScope, static function (Node $node, Scope $scope) use ($nodeCallback, $hookScope, &$gatheredReturnStatements, &$executionEnds, &$hookImpurePoints): void {
-					$nodeCallback($node, $scope);
-					if ($scope->getFunction() !== $hookScope->getFunction()) {
-						return;
-					}
-					if ($scope->isInAnonymousFunction()) {
-						return;
-					}
-					if ($node instanceof PropertyAssignNode) {
-						$hookImpurePoints[] = new ImpurePoint(
-							$scope,
-							$node,
-							'propertyAssign',
-							'property assignment',
-							true,
-						);
-						return;
-					}
-					if ($node instanceof ExecutionEndNode) {
-						$executionEnds[] = $node;
-						return;
-					}
-					if (!$node instanceof Return_) {
-						return;
-					}
+				// enrich attributes of nodes in short hook body statements
+				$traverser = new NodeTraverser(
+					new LineAttributesVisitor($hook->body->getStartLine(), $hook->body->getEndLine()),
+				);
+				$traverser->traverse($stmts);
+			}
 
-					$gatheredReturnStatements[] = new ReturnStatement($scope, $node);
-				}, StatementContext::createTopLevel());
+			$gatheredReturnStatements = [];
+			$executionEnds = [];
+			$methodImpurePoints = [];
+			$statementResult = $this->processStmtNodes(new PropertyHookStatementNode($hook), $stmts, $hookScope, static function (Node $node, Scope $scope) use ($nodeCallback, $hookScope, &$gatheredReturnStatements, &$executionEnds, &$hookImpurePoints): void {
+				$nodeCallback($node, $scope);
+				if ($scope->getFunction() !== $hookScope->getFunction()) {
+					return;
+				}
+				if ($scope->isInAnonymousFunction()) {
+					return;
+				}
+				if ($node instanceof PropertyAssignNode) {
+					$hookImpurePoints[] = new ImpurePoint(
+						$scope,
+						$node,
+						'propertyAssign',
+						'property assignment',
+						true,
+					);
+					return;
+				}
+				if ($node instanceof ExecutionEndNode) {
+					$executionEnds[] = $node;
+					return;
+				}
+				if (!$node instanceof Return_) {
+					return;
+				}
 
-				$nodeCallback(new PropertyHookReturnStatementsNode(
-					$hook,
-					$gatheredReturnStatements,
-					$statementResult,
-					$executionEnds,
-					array_merge($statementResult->getImpurePoints(), $methodImpurePoints),
-					$classReflection,
-					$hookReflection,
-					$propertyReflection,
-				), $hookScope);
-			}
+				$gatheredReturnStatements[] = new ReturnStatement($scope, $node);
+			}, StatementContext::createTopLevel());
 
+			$nodeCallback(new PropertyHookReturnStatementsNode(
+				$hook,
+				$gatheredReturnStatements,
+				$statementResult,
+				$executionEnds,
+				array_merge($statementResult->getImpurePoints(), $methodImpurePoints),
+				$classReflection,
+				$hookReflection,
+				$propertyReflection,
+			), $hookScope);
 		}
 	}
 
@@ -6428,7 +6435,7 @@ public function getPhpDocs(Scope $scope, Node\FunctionLike|Node\Stmt\Property $n
 		} elseif ($node instanceof Node\Stmt\Function_) {
 			$functionName = trim($scope->getNamespace() . '\\' . $node->name->name, '\\');
 		} elseif ($node instanceof Node\PropertyHook) {
-			$propertyName = $node->getAttribute(PropertyHookNameVisitor::ATTRIBUTE_NAME);
+			$propertyName = $node->getAttribute('propertyName');
 			if ($propertyName !== null) {
 				$functionName = sprintf('$%s::%s', $propertyName, $node->name->toString());
 			}

src/Parser/CleaningVisitor.php

@@ -37,7 +37,7 @@ public function enterNode(Node $node): ?Node
 		}
 
 		if ($node instanceof Node\PropertyHook && is_array($node->body)) {
-			$propertyName = $node->getAttribute(PropertyHookNameVisitor::ATTRIBUTE_NAME);
+			$propertyName = $node->getAttribute('propertyName');
 			if ($propertyName !== null) {
 				$node->body = $this->keepVariadicsAndYields($node->body, $propertyName);
 				return $node;

src/Parser/LineAttributesVisitor.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Parser;
+
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+
+final class LineAttributesVisitor extends NodeVisitorAbstract
+{
+
+	public function __construct(private ?int $startLine, private ?int $endLine)
+	{
+	}
+
+	public function enterNode(Node $node): Node
+	{
+		if ($node->getStartLine() === -1) {
+			$node->setAttribute('startLine', $this->startLine);
+		}
+
+		if ($node->getEndLine() === -1) {
+			$node->setAttribute('endLine', $this->endLine);
+		}
+
+		return $node;
+	}
+
+}

src/Parser/SimpleParser.php

@@ -17,7 +17,6 @@ public function __construct(
 		private NameResolver $nameResolver,
 		private VariadicMethodsVisitor $variadicMethodsVisitor,
 		private VariadicFunctionsVisitor $variadicFunctionsVisitor,
-		private PropertyHookNameVisitor $propertyHookNameVisitor,
 	)
 	{
 	}
@@ -53,7 +52,6 @@ public function parseString(string $sourceCode): array
 		$nodeTraverser->addVisitor($this->nameResolver);
 		$nodeTraverser->addVisitor($this->variadicMethodsVisitor);
 		$nodeTraverser->addVisitor($this->variadicFunctionsVisitor);
-		$nodeTraverser->addVisitor($this->propertyHookNameVisitor);
 
 		/** @var array<Node\Stmt> */
 		return $nodeTraverser->traverse($nodes);