Make trait properties and methods first class node citizens

src/Analyser/NodeScopeResolver.php

@@ -500,6 +500,7 @@ private function processStmtNode(
 						true,
 						$param,
 						false,
+						$scope->isInTrait(),
 					), $methodScope);
 				}
 			}
@@ -628,7 +629,7 @@ private function processStmtNode(
 			$this->processAttributeGroups($stmt->attrGroups, $classScope, $classStatementsGatherer);
 
 			$this->processStmtNodes($stmt, $stmt->stmts, $classScope, $classStatementsGatherer);
-			$nodeCallback(new ClassPropertiesNode($stmt, $classStatementsGatherer->getProperties(), $classStatementsGatherer->getTraitProperties(), $classStatementsGatherer->getPropertyUsages(), $classStatementsGatherer->getMethodCalls()), $classScope);
+			$nodeCallback(new ClassPropertiesNode($stmt, $classStatementsGatherer->getProperties(), $classStatementsGatherer->getPropertyUsages(), $classStatementsGatherer->getMethodCalls()), $classScope);
 			$nodeCallback(new ClassMethodsNode($stmt, $classStatementsGatherer->getMethods(), $classStatementsGatherer->getMethodCalls()), $classScope);
 			$nodeCallback(new ClassConstantsNode($stmt, $classStatementsGatherer->getConstants(), $classStatementsGatherer->getConstantFetches()), $classScope);
 			$classReflection->evictPrivateSymbols();
@@ -650,6 +651,7 @@ private function processStmtNode(
 						false,
 						$prop,
 						$isReadOnly,
+						$scope->isInTrait(),
 					),
 					$scope,
 				);

src/Node/ClassMethod.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Node;
+
+class ClassMethod
+{
+
+	public function __construct(
+		private \PhpParser\Node\Stmt\ClassMethod $node,
+		private bool $isDeclaredInTrait,
+	)
+	{
+	}
+
+
+	public function getNode(): \PhpParser\Node\Stmt\ClassMethod
+	{
+		return $this->node;
+	}
+
+	public function isDeclaredInTrait(): bool
+	{
+		return $this->isDeclaredInTrait;
+	}
+
+}

src/Node/ClassMethodsNode.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Node;
 
 use PhpParser\Node\Stmt\ClassLike;
-use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeAbstract;
 use PHPStan\Node\Method\MethodCall;
 

src/Node/ClassPropertiesNode.php

@@ -21,7 +21,6 @@
 use PHPStan\Type\ObjectType;
 use function array_key_exists;
 use function array_keys;
-use function array_merge;
 use function count;
 use function in_array;
 
@@ -31,11 +30,10 @@ class ClassPropertiesNode extends NodeAbstract implements VirtualNode
 
 	/**
 	 * @param ClassPropertyNode[] $properties
-	 * @param ClassPropertyNode[] $traitProperties
 	 * @param array<int, PropertyRead|PropertyWrite> $propertyUsages
 	 * @param array<int, MethodCall> $methodCalls
 	 */
-	public function __construct(private ClassLike $class, private array $properties, private array $traitProperties, private array $propertyUsages, private array $methodCalls)
+	public function __construct(private ClassLike $class, private array $properties, private array $propertyUsages, private array $methodCalls)
 	{
 		parent::__construct($class->getAttributes());
 	}
@@ -53,14 +51,6 @@ public function getProperties(): array
 		return $this->properties;
 	}
 
-	/**
-	 * @return ClassPropertyNode[]
-	 */
-	public function getTraitProperties(): array
-	{
-		return $this->traitProperties;
-	}
-
 	/**
 	 * @return array<int, PropertyRead|PropertyWrite>
 	 */
@@ -102,7 +92,7 @@ public function getUninitializedProperties(
 		$classReflection = $scope->getClassReflection();
 
 		$properties = [];
-		foreach (array_merge($this->getProperties(), $this->getTraitProperties()) as $property) {
+		foreach ($this->getProperties() as $property) {
 			if ($property->isStatic()) {
 				continue;
 			}

src/Node/ClassPropertyNode.php

@@ -22,6 +22,7 @@ public function __construct(
 		private bool $isPromoted,
 		Node $originalNode,
 		private bool $isReadonlyByPhpDoc,
+		private bool $isDeclaredInTrait,
 	)
 	{
 		parent::__construct($originalNode->getAttributes());
@@ -83,6 +84,11 @@ public function isReadOnlyByPhpDoc(): bool
 		return $this->isReadonlyByPhpDoc;
 	}
 
+	public function isDeclaredInTrait(): bool
+	{
+		return $this->isDeclaredInTrait;
+	}
+
 	/**
 	 * @return Identifier|Name|Node\ComplexType|null
 	 */

src/Node/ClassStatementsGatherer.php

@@ -28,10 +28,7 @@ class ClassStatementsGatherer
 	/** @var ClassPropertyNode[] */
 	private array $properties = [];
 
-	/** @var ClassPropertyNode[] */
-	private array $traitProperties = [];
-
-	/** @var Node\Stmt\ClassMethod[] */
+	/** @var ClassMethod[] */
 	private array $methods = [];
 
 	/** @var \PHPStan\Node\Method\MethodCall[] */
@@ -66,15 +63,7 @@ public function getProperties(): array
 	}
 
 	/**
-	 * @return ClassPropertyNode[]
-	 */
-	public function getTraitProperties(): array
-	{
-		return $this->traitProperties;
-	}
-
-	/**
-	 * @return Node\Stmt\ClassMethod[]
+	 * @return ClassMethod[]
 	 */
 	public function getMethods(): array
 	{
@@ -128,7 +117,7 @@ private function gatherNodes(Node $node, Scope $scope): void
 		if ($scope->getClassReflection()->getName() !== $this->classReflection->getName()) {
 			return;
 		}
-		if ($node instanceof ClassPropertyNode && !$scope->isInTrait()) {
+		if ($node instanceof ClassPropertyNode) {
 			$this->properties[] = $node;
 			if ($node->isPromoted()) {
 				$this->propertyUsages[] = new PropertyWrite(
@@ -138,18 +127,8 @@ private function gatherNodes(Node $node, Scope $scope): void
 			}
 			return;
 		}
-		if ($node instanceof ClassPropertyNode && $scope->isInTrait()) {
-			$this->traitProperties[] = $node;
-			if ($node->isPromoted()) {
-				$this->propertyUsages[] = new PropertyWrite(
-					new PropertyFetch(new Expr\Variable('this'), new Identifier($node->getName())),
-					$scope,
-				);
-			}
-			return;
-		}
-		if ($node instanceof Node\Stmt\ClassMethod && !$scope->isInTrait()) {
-			$this->methods[] = $node;
+		if ($node instanceof Node\Stmt\ClassMethod) {
+			$this->methods[] = new ClassMethod($node, $scope->isInTrait());
 			return;
 		}
 		if ($node instanceof Node\Stmt\ClassConst) {

src/Rules/DeadCode/UnusedPrivateMethodRule.php

@@ -48,17 +48,20 @@ public function processNode(Node $node, Scope $scope): array
 
 		$methods = [];
 		foreach ($node->getMethods() as $method) {
-			if (!$method->isPrivate()) {
+			if (!$method->getNode()->isPrivate()) {
 				continue;
 			}
-			$methodName = $method->name->toString();
+			if ($method->isDeclaredInTrait()) {
+				continue;
+			}
+			$methodName = $method->getNode()->name->toString();
 			if ($constructor !== null && $constructor->getName() === $methodName) {
 				continue;
 			}
 			if (strtolower($methodName) === '__clone') {
 				continue;
 			}
-			$methods[$method->name->toString()] = $method;
+			$methods[$methodName] = $method;
 		}
 
 		$arrayCalls = [];
@@ -146,13 +149,13 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$errors = [];
-		foreach ($methods as $methodName => $methodNode) {
+		foreach ($methods as $methodName => $method) {
 			$methodType = 'Method';
-			if ($methodNode->isStatic()) {
+			if ($method->getNode()->isStatic()) {
 				$methodType = 'Static method';
 			}
 			$errors[] = RuleErrorBuilder::message(sprintf('%s %s::%s() is unused.', $methodType, $classReflection->getDisplayName(), $methodName))
-				->line($methodNode->getLine())
+				->line($method->getNode()->getLine())
 				->identifier('deadCode.unusedMethod')
 				->metadata([
 					'classOrder' => $node->getClass()->getAttribute('statementOrder'),

src/Rules/DeadCode/UnusedPrivatePropertyRule.php

@@ -60,6 +60,9 @@ public function processNode(Node $node, Scope $scope): array
 			if (!$property->isPrivate()) {
 				continue;
 			}
+			if ($property->isDeclaredInTrait()) {
+				continue;
+			}
 
 			$alwaysRead = false;
 			$alwaysWritten = false;