Do not report unused private methods/properties in traits

ondrejmirtes · ondrejmirtes · commit 5958c2989038 · 2020-08-02T20:19:07.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -585,6 +585,9 @@ private function processStmtNode(
 				if (!$scope->isInClass()) {
 					throw new \PHPStan\ShouldNotHappenException();
 				}
+				if ($scope->isInTrait()) {
+					return;
+				}
 				if ($scope->getClassReflection()->getName() !== $classReflection->getName()) {
 					return;
 				}
diff --git a/tests/PHPStan/Rules/DeadCode/data/unused-private-method.php b/tests/PHPStan/Rules/DeadCode/data/unused-private-method.php
@@ -121,3 +121,30 @@ public function doBar(string $s)
 	}
 
 }
+
+trait FooTrait
+{
+
+	private function doFoo()
+	{
+
+	}
+
+	private function doBar()
+	{
+
+	}
+
+	public function doBaz()
+	{
+		$this->doFoo();
+	}
+
+}
+
+class UsingFooTrait
+{
+
+	use FooTrait;
+
+}
diff --git a/tests/PHPStan/Rules/DeadCode/data/unused-private-property.php b/tests/PHPStan/Rules/DeadCode/data/unused-private-property.php
@@ -154,3 +154,29 @@ class TextExtension
 	private $used;
 
 }
+
+trait FooTrait
+{
+
+	private $prop1;
+
+	private $prop2;
+
+	public function doFoo()
+	{
+		echo $this->prop1;
+	}
+
+	public function setFoo($prop1)
+	{
+		$this->prop1 = $prop1;
+	}
+
+}
+
+class ClassUsingTrait
+{
+
+	use FooTrait;
+
+}

Original file line number	Diff line number	Diff line change
`@@ -585,6 +585,9 @@ private function processStmtNode(`
`585`	`585`	`if (!$scope->isInClass()) {`
`586`	`586`	`throw new \PHPStan\ShouldNotHappenException();`
`587`	`587`	`}`
	`588`	`+ if ($scope->isInTrait()) {`
	`589`	`+ return;`
	`590`	`+ }`
`588`	`591`	`if ($scope->getClassReflection()->getName() !== $classReflection->getName()) {`
`589`	`592`	`return;`
`590`	`593`	`}`