Variable variables - reworded error messages so that they're ignorable easier

Author: ondrejmirtes

src/Rules/VariableVariables/VariableMethodCallRule.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Type\VerbosityLevel;
 
 class VariableMethodCallRule implements Rule
 {
@@ -26,7 +27,10 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		return [
-			'Variable method calls are not allowed.',
+			sprintf(
+				'Variable method call on %s.',
+				$scope->getType($node->var)->describe(VerbosityLevel::typeOnly())
+			),
 		];
 	}
 

src/Rules/VariableVariables/VariablePropertyFetchRule.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Type\VerbosityLevel;
 
 class VariablePropertyFetchRule implements Rule
 {
@@ -26,7 +27,10 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		return [
-			'Variable properties are not allowed.',
+			sprintf(
+				'Variable property access on %s.',
+				$scope->getType($node->var)->describe(VerbosityLevel::typeOnly())
+			),
 		];
 	}
 

src/Rules/VariableVariables/VariableStaticMethodCallRule.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Type\VerbosityLevel;
 
 class VariableStaticMethodCallRule implements Rule
 {
@@ -25,8 +26,17 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
+		if ($node->class instanceof Node\Name) {
+			$methodCalledOn = $scope->resolveName($node->class);
+		} else {
+			$methodCalledOn = $scope->getType($node->class)->describe(VerbosityLevel::typeOnly());
+		}
+
 		return [
-			'Variable static method calls are not allowed.',
+			sprintf(
+				'Variable static method call on %s.',
+				$methodCalledOn
+			),
 		];
 	}
 

src/Rules/VariableVariables/VariableStaticPropertyFetchRule.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
+use PHPStan\Type\VerbosityLevel;
 
 class VariableStaticPropertyFetchRule implements Rule
 {
@@ -21,12 +22,21 @@ public function getNodeType(): string
 	 */
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if ($node->name instanceof Node\VarLikeIdentifier) {
+		if ($node->name instanceof Node\Identifier) {
 			return [];
 		}
 
+		if ($node->class instanceof Node\Name) {
+			$propertyAccessedOn = $scope->resolveName($node->class);
+		} else {
+			$propertyAccessedOn = $scope->getType($node->class)->describe(VerbosityLevel::typeOnly());
+		}
+
 		return [
-			'Variable static properties are not allowed.',
+			sprintf(
+				'Variable static property access on %s.',
+				$propertyAccessedOn
+			),
 		];
 	}
 

tests/Rules/VariableVariables/VariableMethodCallRuleTest.php

@@ -17,7 +17,7 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/methods.php'], [
 			[
-				'Variable method calls are not allowed.',
+				'Variable method call on stdClass.',
 				7,
 			],
 		]);

tests/Rules/VariableVariables/VariablePropertyFetchRuleTest.php

@@ -17,11 +17,11 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/properties.php'], [
 			[
-				'Variable properties are not allowed.',
+				'Variable property access on stdClass.',
 				6,
 			],
 			[
-				'Variable properties are not allowed.',
+				'Variable property access on stdClass.',
 				9,
 			],
 		]);

tests/Rules/VariableVariables/VariableStaticMethodCallRuleTest.php

@@ -17,9 +17,13 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/staticMethods.php'], [
 			[
-				'Variable static method calls are not allowed.',
+				'Variable static method call on Foo.',
 				7,
 			],
+			[
+				'Variable static method call on stdClass.',
+				9,
+			],
 		]);
 	}
 

tests/Rules/VariableVariables/VariableStaticPropertyFetchRuleTest.php

@@ -17,21 +17,25 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/staticProperties.php'], [
 			[
-				'Variable static properties are not allowed.',
+				'Variable static property access on Foo.',
 				7,
 			],
 			[
-				'Variable static properties are not allowed.',
+				'Variable static property access on Foo.',
 				8,
 			],
 			[
-				'Variable static properties are not allowed.',
+				'Variable static property access on Foo.',
 				10,
 			],
 			[
-				'Variable static properties are not allowed.',
+				'Variable static property access on Foo.',
 				11,
 			],
+			[
+				'Variable static property access on stdClass.',
+				13,
+			],
 		]);
 	}
 

tests/Rules/VariableVariables/data/staticMethods.php

@@ -1,8 +1,10 @@
 <?php
 
-function () {
+function (stdClass $std) {
 	Foo::doFoo();
 
 	$foo = 'doBar';
 	Foo::$foo();
+
+	$std::$foo();
 };

tests/Rules/VariableVariables/data/staticProperties.php

@@ -9,4 +9,6 @@ function (stdClass $std) {
 
 	echo Foo::${$bar};
 	Foo::${$bar} = 123;
+
+	$std::$$bar = 123;
 };