Fix detecting unused property from class used in trait

localheinz · Aug 5, 2020 · 11ef998 · 11ef998
1 parent f368080
commit 11ef998
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -585,17 +585,14 @@ private function processStmtNode(
 				if (!$scope->isInClass()) {
 					throw new \PHPStan\ShouldNotHappenException();
 				}
-				if ($scope->isInTrait()) {
-					return;
-				}
 				if ($scope->getClassReflection()->getName() !== $classReflection->getName()) {
 					return;
 				}
-				if ($node instanceof Node\Stmt\Property) {
+				if ($node instanceof Node\Stmt\Property && !$scope->isInTrait()) {
 					$properties[] = $node;
 					return;
 				}
-				if ($node instanceof Node\Stmt\ClassMethod) {
+				if ($node instanceof Node\Stmt\ClassMethod && !$scope->isInTrait()) {
 					$methods[] = $node;
 					return;
 				}

diff --git a/tests/PHPStan/Rules/DeadCode/data/private-property-trait.php b/tests/PHPStan/Rules/DeadCode/data/private-property-trait.php
@@ -19,11 +19,23 @@ public function setFoo($prop1)
 		$this->prop1 = $prop1;
 	}
 
+	public function getProp3()
+	{
+		return $this->prop3;
+	}
+
 }
 
 class ClassUsingTrait
 {
 
 	use FooTrait;
 
+	private $prop3;
+
+	public function __construct(string $prop3)
+	{
+		$this->prop3 = $prop3;
+	}
+
 }
diff --git a/tests/PHPStan/Rules/DeadCode/data/unused-private-method.php b/tests/PHPStan/Rules/DeadCode/data/unused-private-method.php
@@ -138,6 +138,7 @@ private function doBar()
 	public function doBaz()
 	{
 		$this->doFoo();
+		$this->doLorem();
 	}
 
 }
@@ -147,4 +148,9 @@ class UsingFooTrait
 
 	use FooTrait;
 
+	private function doLorem()
+	{
+
+	}
+
 }