Allow to dump more than one thing

Author: VincentLanglet

src/Rules/Debug/DumpNativeTypeRule.php

@@ -35,7 +35,8 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (count($node->getArgs()) === 0) {
+		$args = $node->getArgs();
+		if (count($args) === 0) {
 			return [];
 		}
 
@@ -48,14 +49,17 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		return [
-			RuleErrorBuilder::message(
+		$errors = [];
+		foreach ($args as $arg) {
+			$errors[] = RuleErrorBuilder::message(
 				sprintf(
 					'Dumped type: %s',
-					$scope->getNativeType($node->getArgs()[0]->value)->describe(VerbosityLevel::precise()),
+					$scope->getNativeType($arg->value)->describe(VerbosityLevel::precise()),
 				),
-			)->nonIgnorable()->identifier('phpstan.dumpNativeType')->build(),
-		];
+			)->nonIgnorable()->identifier('phpstan.dumpNativeType')->build();
+		}
+
+		return $errors;
 	}
 
 }

src/Rules/Debug/DumpPhpDocTypeRule.php

@@ -35,7 +35,8 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (count($node->getArgs()) === 0) {
+		$args = $node->getArgs();
+		if (count($args) === 0) {
 			return [];
 		}
 
@@ -48,14 +49,17 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		return [
-			RuleErrorBuilder::message(
+		$errors = [];
+		foreach ($args as $arg) {
+			$errors[] = RuleErrorBuilder::message(
 				sprintf(
 					'Dumped type: %s',
-					$this->printer->print($scope->getType($node->getArgs()[0]->value)->toPhpDocNode()),
+					$this->printer->print($scope->getType($arg->value)->toPhpDocNode()),
 				),
-			)->nonIgnorable()->identifier('phpstan.dumpPhpDocType')->build(),
-		];
+			)->nonIgnorable()->identifier('phpstan.dumpPhpDocType')->build();
+		}
+
+		return $errors;
 	}
 
 }

src/Rules/Debug/DumpTypeRule.php

@@ -35,7 +35,8 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (count($node->getArgs()) === 0) {
+		$args = $node->getArgs();
+		if (count($args) === 0) {
 			return [];
 		}
 
@@ -48,14 +49,17 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		return [
-			RuleErrorBuilder::message(
+		$errors = [];
+		foreach ($args as $arg) {
+			$errors[] = RuleErrorBuilder::message(
 				sprintf(
 					'Dumped type: %s',
-					$scope->getType($node->getArgs()[0]->value)->describe(VerbosityLevel::precise()),
+					$scope->getType($arg->value)->describe(VerbosityLevel::precise()),
 				),
-			)->nonIgnorable()->identifier('phpstan.dumpType')->build(),
-		];
+			)->nonIgnorable()->identifier('phpstan.dumpType')->build();
+		}
+
+		return $errors;
 	}
 
 }

src/dumpType.php

@@ -9,7 +9,7 @@
  *
  * @throws void
  */
-function dumpType($value) // phpcs:ignore Squiz.Functions.GlobalFunction.Found
+function dumpType(...$value) // phpcs:ignore Squiz.Functions.GlobalFunction.Found
 {
 	return null;
 }
@@ -21,7 +21,7 @@ function dumpType($value) // phpcs:ignore Squiz.Functions.GlobalFunction.Found
  *
  * @throws void
  */
-function dumpNativeType($value) // phpcs:ignore Squiz.Functions.GlobalFunction.Found
+function dumpNativeType(...$value) // phpcs:ignore Squiz.Functions.GlobalFunction.Found
 {
 	return null;
 }
@@ -33,7 +33,7 @@ function dumpNativeType($value) // phpcs:ignore Squiz.Functions.GlobalFunction.F
  *
  * @throws void
  */
-function dumpPhpDocType($value) // phpcs:ignore Squiz.Functions.GlobalFunction.Found
+function dumpPhpDocType(...$value) // phpcs:ignore Squiz.Functions.GlobalFunction.Found
 {
 	return null;
 }

tests/PHPStan/Rules/Debug/DumpNativeTypeRuleTest.php

@@ -27,6 +27,14 @@ public function testRule(): void
 				'Dumped type: array',
 				12,
 			],
+			[
+				'Dumped type: non-empty-array',
+				14,
+			],
+			[
+				'Dumped type: array',
+				14,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Debug/DumpPhpDocTypeRuleTest.php

@@ -100,6 +100,14 @@ public function testRuleSymbols(): void
 				'Dumped type: T',
 				36,
 			],
+			[
+				'Dumped type: array{1: 1}',
+				41,
+			],
+			[
+				'Dumped type: array{2: 2}',
+				41,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/Debug/DumpTypeRuleTest.php

@@ -50,6 +50,20 @@ public function testRuleInUse(): void
 		]);
 	}
 
+	public function testRuleWithMultipleVars(): void
+	{
+		$this->analyse([__DIR__ . '/data/dump-type-variadic.php'], [
+			[
+				'Dumped type: non-empty-array',
+				10,
+			],
+			[
+				'Dumped type: array',
+				10,
+			],
+		]);
+	}
+
 	public function testBug7803(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-7803.php'], [

tests/PHPStan/Rules/Debug/data/dump-native-type.php

@@ -10,4 +10,6 @@ function (array $a, array $b) {
 
 	dumpNativeType($a);
 	dumpNativeType($b);
+
+	dumpNativeType($a, $b);
 };

tests/PHPStan/Rules/Debug/data/dump-phpdoc-type.php

@@ -37,3 +37,5 @@ function id($value)
 
 	return $value;
 }
+
+dumpPhpDocType([1 => 1], [2 => 2]);

tests/PHPStan/Rules/Debug/data/dump-type-variadic.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace PHPStan;
+
+function (array $a, array $b) {
+	if ($a === []) {
+		return;
+	}
+
+	dumpType($a, $b);
+};