Registry: support multiple rules registered by a single class

src/Rules/Registry.php

@@ -33,11 +33,11 @@ public function getRules(string $nodeType): array
 			$rules = [];
 			foreach ($nodeTypes as $nodeType) {
 				foreach ($this->rules[$nodeType] ?? [] as $rule) {
-					$rules[get_class($rule)] = $rule;
+					$rules[] = $rule;
 				}
 			}
 
-			$this->cache[$nodeType] = array_values($rules);
+			$this->cache[$nodeType] = $rules;
 		}
 
 		return $this->cache[$nodeType];

tests/PHPStan/Rules/RegistryTest.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules;
 
+use PHPStan\Analyser\Scope;
+
 class RegistryTest extends \PHPStan\Testing\TestCase
 {
 
@@ -20,4 +22,26 @@ public function testGetRules(): void
 		$this->assertCount(0, $registry->getRules(\PhpParser\Node\Expr\MethodCall::class));
 	}
 
+	public function testGetRulesWithTwoDifferentInstances(): void
+	{
+		$fooRule = new UniversalRule(\PhpParser\Node\Expr\FuncCall::class, function (\PhpParser\Node\Expr\FuncCall $node, Scope $scope): array {
+			return ['Foo error'];
+		});
+		$barRule = new UniversalRule(\PhpParser\Node\Expr\FuncCall::class, function (\PhpParser\Node\Expr\FuncCall $node, Scope $scope): array {
+			return ['Bar error'];
+		});
+
+		$registry = new Registry([
+			$fooRule,
+			$barRule,
+		]);
+
+		$rules = $registry->getRules(\PhpParser\Node\Expr\FuncCall::class);
+		$this->assertCount(2, $rules);
+		$this->assertSame($fooRule, $rules[0]);
+		$this->assertSame($barRule, $rules[1]);
+
+		$this->assertCount(0, $registry->getRules(\PhpParser\Node\Expr\MethodCall::class));
+	}
+
 }

tests/PHPStan/Rules/UniversalRule.php

@@ -0,0 +1,34 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules;
+
+use PhpParser\Node;
+use PHPStan\Analyser\Scope;
+
+class UniversalRule implements Rule
+{
+
+	/** @var string */
+	private $nodeType;
+
+	/** @var callable */
+	private $processNodeCallback;
+
+	public function __construct(string $nodeType, callable $processNodeCallback)
+	{
+		$this->nodeType = $nodeType;
+		$this->processNodeCallback = $processNodeCallback;
+	}
+
+	public function getNodeType(): string
+	{
+		return $this->nodeType;
+	}
+
+	public function processNode(Node $node, Scope $scope): array
+	{
+		$callback = $this->processNodeCallback;
+		$callback($node, $scope);
+	}
+
+}