Process attribute arguments recursively

ondrejmirtes · ondrejmirtes · commit 0cfeb1b93021 · 2021-09-20T11:10:51.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -408,7 +408,7 @@ private function processStmtNode(
 			foreach ($stmt->attrGroups as $attrGroup) {
 				foreach ($attrGroup->attrs as $attr) {
 					foreach ($attr->args as $arg) {
-						$nodeCallback($arg->value, $scope);
+						$this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());
 					}
 				}
 			}
@@ -469,7 +469,7 @@ private function processStmtNode(
 			foreach ($stmt->attrGroups as $attrGroup) {
 				foreach ($attrGroup->attrs as $attr) {
 					foreach ($attr->args as $arg) {
-						$nodeCallback($arg->value, $scope);
+						$this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());
 					}
 				}
 			}
@@ -644,7 +644,7 @@ private function processStmtNode(
 			foreach ($stmt->attrGroups as $attrGroup) {
 				foreach ($attrGroup->attrs as $attr) {
 					foreach ($attr->args as $arg) {
-						$nodeCallback($arg->value, $classScope);
+						$this->processExprNode($arg->value, $classScope, $nodeCallback, ExpressionContext::createDeep());
 					}
 				}
 			}
@@ -660,7 +660,7 @@ private function processStmtNode(
 			foreach ($stmt->attrGroups as $attrGroup) {
 				foreach ($attrGroup->attrs as $attr) {
 					foreach ($attr->args as $arg) {
-						$nodeCallback($arg->value, $scope);
+						$this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());
 					}
 				}
 			}
@@ -1378,7 +1378,7 @@ private function processStmtNode(
 				foreach ($stmt->attrGroups as $attrGroup) {
 					foreach ($attrGroup->attrs as $attr) {
 						foreach ($attr->args as $arg) {
-							$nodeCallback($arg->value, $scope);
+							$this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());
 						}
 					}
 				}
@@ -3068,7 +3068,7 @@ private function processParamNode(
 		foreach ($param->attrGroups as $attrGroup) {
 			foreach ($attrGroup->attrs as $attr) {
 				foreach ($attr->args as $arg) {
-					$nodeCallback($arg->value, $scope);
+					$this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());
 				}
 			}
 		}
diff --git a/tests/PHPStan/Rules/DeadCode/UnusedPrivateConstantRuleTest.php b/tests/PHPStan/Rules/DeadCode/UnusedPrivateConstantRuleTest.php
@@ -46,4 +46,13 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug5651(): void
+	{
+		if (PHP_VERSION_ID < 80000 && !self::$useStaticReflectionProvider) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-5651.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/DeadCode/data/bug-5651.php b/tests/PHPStan/Rules/DeadCode/data/bug-5651.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Bug5651;
+
+#[\Attribute]
+class MyAttribute
+{
+
+	/** @var string[] */
+	public $values;
+
+	/**
+	 * @param string[] $values
+	 */
+	public function __construct(array $values)
+	{
+		$this->values = $values;
+	}
+}
+
+class HelloWorld
+{
+	private const BAR = 'bar';
+
+	#[MyAttribute(['foo' => self::BAR])]
+	public function sayHello(): void
+	{
+
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ private function processStmtNode(`
`408`	`408`	`foreach ($stmt->attrGroups as $attrGroup) {`
`409`	`409`	`foreach ($attrGroup->attrs as $attr) {`
`410`	`410`	`foreach ($attr->args as $arg) {`
`411`		`- $nodeCallback($arg->value, $scope);`
	`411`	`+ $this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());`
`412`	`412`	`}`
`413`	`413`	`}`
`414`	`414`	`}`
`@@ -469,7 +469,7 @@ private function processStmtNode(`
`469`	`469`	`foreach ($stmt->attrGroups as $attrGroup) {`
`470`	`470`	`foreach ($attrGroup->attrs as $attr) {`
`471`	`471`	`foreach ($attr->args as $arg) {`
`472`		`- $nodeCallback($arg->value, $scope);`
	`472`	`+ $this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());`
`473`	`473`	`}`
`474`	`474`	`}`
`475`	`475`	`}`
`@@ -644,7 +644,7 @@ private function processStmtNode(`
`644`	`644`	`foreach ($stmt->attrGroups as $attrGroup) {`
`645`	`645`	`foreach ($attrGroup->attrs as $attr) {`
`646`	`646`	`foreach ($attr->args as $arg) {`
`647`		`- $nodeCallback($arg->value, $classScope);`
	`647`	`+ $this->processExprNode($arg->value, $classScope, $nodeCallback, ExpressionContext::createDeep());`
`648`	`648`	`}`
`649`	`649`	`}`
`650`	`650`	`}`
`@@ -660,7 +660,7 @@ private function processStmtNode(`
`660`	`660`	`foreach ($stmt->attrGroups as $attrGroup) {`
`661`	`661`	`foreach ($attrGroup->attrs as $attr) {`
`662`	`662`	`foreach ($attr->args as $arg) {`
`663`		`- $nodeCallback($arg->value, $scope);`
	`663`	`+ $this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());`
`664`	`664`	`}`
`665`	`665`	`}`
`666`	`666`	`}`
`@@ -1378,7 +1378,7 @@ private function processStmtNode(`
`1378`	`1378`	`foreach ($stmt->attrGroups as $attrGroup) {`
`1379`	`1379`	`foreach ($attrGroup->attrs as $attr) {`
`1380`	`1380`	`foreach ($attr->args as $arg) {`
`1381`		`- $nodeCallback($arg->value, $scope);`
	`1381`	`+ $this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());`
`1382`	`1382`	`}`
`1383`	`1383`	`}`
`1384`	`1384`	`}`
`@@ -3068,7 +3068,7 @@ private function processParamNode(`
`3068`	`3068`	`foreach ($param->attrGroups as $attrGroup) {`
`3069`	`3069`	`foreach ($attrGroup->attrs as $attr) {`
`3070`	`3070`	`foreach ($attr->args as $arg) {`
`3071`		`- $nodeCallback($arg->value, $scope);`
	`3071`	`+ $this->processExprNode($arg->value, $scope, $nodeCallback, ExpressionContext::createDeep());`
`3072`	`3072`	`}`
`3073`	`3073`	`}`
`3074`	`3074`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,13 @@ public function testRule(): void`
`46`	`46`	`]);`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ public function testBug5651(): void`
	`50`	`+ {`
	`51`	`+ if (PHP_VERSION_ID < 80000 && !self::$useStaticReflectionProvider) {`
	`52`	`+ $this->markTestSkipped('Test requires PHP 8.0.');`
	`53`	`+ }`
	`54`	`+`
	`55`	`+ $this->analyse([__DIR__ . '/data/bug-5651.php'], []);`
	`56`	`+ }`
	`57`	`+`
`49`	`58`	`}`