Fix 9654

Author: VincentLanglet

src/Rules/Classes/NewStaticRule.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\RegisteredRule;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\Php\PhpMethodReflection;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
@@ -17,6 +18,11 @@
 final class NewStaticRule implements Rule
 {
 
+	public function __construct(
+		private PhpVersion $phpVersion,
+	) {
+	}
+
 	public function getNodeType(): string
 	{
 		return Node\Expr\New_::class;
@@ -77,6 +83,20 @@ public function processNode(Node $node, Scope $scope): array
 			}
 		}
 
+		if (
+			$this->phpVersion->supportsAbstractTraitMethods()
+			&& $scope->isInTrait()
+		) {
+			$traitReflection = $scope->getTraitReflection();
+			if ($traitReflection->hasConstructor()) {
+				$traitConstructor = $traitReflection->getConstructor();
+
+				if ($traitConstructor instanceof PhpMethodReflection && $traitConstructor->isAbstract()) {
+					return [];
+				}
+			}
+		}
+
 		return $messages;
 	}
 

tests/PHPStan/Rules/Classes/NewStaticRuleTest.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Rules\Classes;
 
+use PHPStan\Php\PhpVersion;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 
@@ -13,7 +14,9 @@ class NewStaticRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		return new NewStaticRule();
+		return new NewStaticRule(
+			new PhpVersion(PHP_VERSION_ID),
+		);
 	}
 
 	public function testRule(): void
@@ -39,4 +42,9 @@ public function testRuleWithConsistentConstructor(): void
 		$this->analyse([__DIR__ . '/data/new-static-consistent-constructor.php'], []);
 	}
 
+	public function testBug9654(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-9654.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Classes/data/bug-9654.php

@@ -0,0 +1,32 @@
+<?php // lint >= 8.0
+
+namespace Bug9654;
+
+trait Abc
+{
+	abstract public function __construct();
+
+	public static function create(): static
+	{
+		return new static();  // this is safe as the constructor is defined abstract in this trait
+	}
+}
+
+class Foo
+{
+	use Abc;
+
+	public function __construct() {
+
+	}
+}
+
+class Bar
+{
+	use Abc;
+
+	public function __construct(int $i = 0)
+	{
+		$i = $i*2;
+	}
+}