Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -2953,6 +2953,7 @@ public function enterClassMethod(
 		array $parameterOutTypes = [],
 		array $immediatelyInvokedCallableParameters = [],
 		array $phpDocClosureThisTypeParameters = [],
+		bool $isConstructor = false,
 	): self
 	{
 		if (!$this->isInClass()) {
@@ -2984,6 +2985,7 @@ public function enterClassMethod(
 				array_map(fn (Type $type): Type => $this->transformStaticType(TemplateTypeHelper::toArgument($type)), $parameterOutTypes),
 				$immediatelyInvokedCallableParameters,
 				array_map(fn (Type $type): Type => $this->transformStaticType(TemplateTypeHelper::toArgument($type)), $phpDocClosureThisTypeParameters),
+				$isConstructor,
 			),
 			!$classMethod->isStatic(),
 		);
@@ -3068,6 +3070,7 @@ public function enterPropertyHook(
 				[],
 				[],
 				[],
+				false,
 			),
 			true,
 		);

src/Analyser/NodeScopeResolver.php

@@ -648,6 +648,9 @@ private function processStmtNode(
 				[$isDeprecated, $deprecatedDescription] = $this->getDeprecatedAttribute($scope, $stmt);
 			}
 
+			$isFromTrait = $stmt->getAttribute('originalTraitMethodName') === '__construct';
+			$isConstructor = $isFromTrait || $stmt->name->toLowerString() === '__construct';
+
 			$methodScope = $scope->enterClassMethod(
 				$stmt,
 				$templateTypeMap,
@@ -666,6 +669,7 @@ private function processStmtNode(
 				$phpDocParameterOutTypes,
 				$phpDocImmediatelyInvokedCallableParameters,
 				$phpDocClosureThisTypeParameters,
+				$isConstructor,
 			);
 
 			if (!$scope->isInClass()) {
@@ -674,8 +678,7 @@ private function processStmtNode(
 
 			$classReflection = $scope->getClassReflection();
 
-			$isFromTrait = $stmt->getAttribute('originalTraitMethodName') === '__construct';
-			if ($isFromTrait || $stmt->name->toLowerString() === '__construct') {
+			if ($isConstructor) {
 				foreach ($stmt->params as $param) {
 					if ($param->flags === 0 && $param->hooks === []) {
 						continue;

src/Reflection/Php/PhpMethodFromParserNodeReflection.php

@@ -62,6 +62,7 @@ public function __construct(
 		array $parameterOutTypes,
 		array $immediatelyInvokedCallableParameters,
 		array $phpDocClosureThisTypeParameters,
+		private bool $isConstructor,
 	)
 	{
 		if ($this->classMethod instanceof Node\PropertyHook) {
@@ -73,7 +74,10 @@ public function __construct(
 		}
 
 		$name = strtolower($classMethod->name->name);
-		if (in_array($name, ['__construct', '__destruct', '__unset', '__wakeup', '__clone'], true)) {
+		if ($this->isConstructor) {
+			$realReturnType = new VoidType();
+		}
+		if (in_array($name, ['__destruct', '__unset', '__wakeup', '__clone'], true)) {
 			$realReturnType = new VoidType();
 		}
 		if ($name === '__tostring') {
@@ -265,6 +269,11 @@ public function isAbstract(): TrinaryLogic
 		return TrinaryLogic::createFromBoolean($method->isAbstract());
 	}
 
+	public function isConstructor(): bool
+	{
+		return $this->isConstructor;
+	}
+
 	public function hasSideEffects(): TrinaryLogic
 	{
 		if (

src/Rules/DeadCode/ConstructorWithoutImpurePointsCollector.php

@@ -7,7 +7,6 @@
 use PHPStan\Collectors\Collector;
 use PHPStan\Node\MethodReturnStatementsNode;
 use function count;
-use function strtolower;
 
 /**
  * @implements Collector<MethodReturnStatementsNode, string>
@@ -23,7 +22,7 @@ public function getNodeType(): string
 	public function processNode(Node $node, Scope $scope)
 	{
 		$method = $node->getMethodReflection();
-		if (strtolower($method->getName()) !== '__construct') {
+		if (!$method->isConstructor()) {
 			return null;
 		}
 

src/Rules/DeadCode/MethodWithoutImpurePointsCollector.php

@@ -49,11 +49,7 @@ public function processNode(Node $node, Scope $scope)
 			return null;
 		}
 
-		$declaringClass = $method->getDeclaringClass();
-		if (
-			$declaringClass->hasConstructor()
-			&& $declaringClass->getConstructor()->getName() === $method->getName()
-		) {
+		if ($method->isConstructor()) {
 			return null;
 		}
 

src/Rules/Pure/FunctionPurityCheck.php

@@ -40,18 +40,11 @@ public function check(
 		array $impurePoints,
 		array $throwPoints,
 		array $statements,
+		bool $isConstructor,
 	): array
 	{
 		$errors = [];
 		$isPure = $functionReflection->isPure();
-		$isConstructor = false;
-		if (
-			$functionReflection instanceof ExtendedMethodReflection
-			&& $functionReflection->getDeclaringClass()->hasConstructor()
-			&& $functionReflection->getDeclaringClass()->getConstructor()->getName() === $functionReflection->getName()
-		) {
-			$isConstructor = true;
-		}
 
 		if ($isPure->yes()) {
 			foreach ($parameters as $parameter) {

src/Rules/Pure/PureFunctionRule.php

@@ -36,6 +36,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->getImpurePoints(),
 			$node->getStatementResult()->getThrowPoints(),
 			$node->getStatements(),
+			false,
 		);
 	}
 

src/Rules/Pure/PureMethodRule.php

@@ -36,6 +36,7 @@ public function processNode(Node $node, Scope $scope): array
 			$node->getImpurePoints(),
 			$node->getStatementResult()->getThrowPoints(),
 			$node->getStatements(),
+			$method->isConstructor(),
 		);
 	}
 

tests/PHPStan/Rules/DeadCode/CallToMethodStatementWithoutImpurePointsRuleTest.php

@@ -72,6 +72,14 @@ public function testBug11011(): void
 		]);
 	}
 
+	public function testBug12379(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.1.');
+		}
+		$this->analyse([__DIR__ . '/data/bug-12379.php'], []);
+	}
+
 	protected function getCollectors(): array
 	{
 		return [

tests/PHPStan/Rules/DeadCode/data/bug-12379.php

@@ -0,0 +1,22 @@
+<?php // lint >= 8.1
+
+namespace Bug12379;
+
+class HelloWorld
+{
+	use myTrait{
+		myTrait::__construct as private __myTraitConstruct;
+	}
+
+	public function __construct(
+		int $entityManager
+	){
+		$this->__myTraitConstruct($entityManager);
+	}
+}
+
+trait myTrait{
+	public function __construct(
+		private readonly int $entityManager
+	){}
+}