cleanup

Author: staabm

extension.neon

@@ -58,8 +58,6 @@ services:
 		factory: @PHPStan\Rules\PHPUnit\TestMethodsHelperFactory::create()
 	-
 		class: PHPStan\Rules\PHPUnit\TestMethodsHelperFactory
-		arguments:
-			parser: @defaultAnalysisParser
 
 	-
 		class: PHPStan\Rules\PHPUnit\PHPUnitVersionDetector

rules.neon

@@ -27,3 +27,6 @@ services:
 
 	-
 		class: PHPStan\Rules\PHPUnit\AssertEqualsIsDiscouragedRule
+
+	-
+		class: PHPStan\Rules\PHPUnit\DataProviderDataRule

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -106,10 +106,6 @@ public function processNode(Node $node, Scope $scope): array
 
 		foreach ($testsWithProvider as $testMethod) {
 			foreach ($arrayExprs as $arrayExpr) {
-				if (!$arrayExpr instanceof Node\Expr\Array_) {
-					throw new ShouldNotHappenException();
-				}
-
 				$args = $this->arrayItemsToArgs($arrayExpr);
 				if ($args === null) {
 					continue;

src/Rules/PHPUnit/TestMethodsHelper.php

@@ -15,24 +15,16 @@
 final class TestMethodsHelper
 {
 
-	private ReflectionProvider $reflectionProvider;
-
 	private FileTypeMapper $fileTypeMapper;
 
-	private Parser $parser;
-
 	private bool $phpunit10OrNewer;
 
 	public function __construct(
-		ReflectionProvider $reflectionProvider,
 		FileTypeMapper $fileTypeMapper,
-		Parser $parser,
 		bool $phpunit10OrNewer
 	)
 	{
-		$this->reflectionProvider = $reflectionProvider;
 		$this->fileTypeMapper = $fileTypeMapper;
-		$this->parser = $parser;
 		$this->phpunit10OrNewer = $phpunit10OrNewer;
 	}
 
@@ -72,7 +64,7 @@ public function getTestMethods(ClassReflection $classReflection, Scope $scope):
 				continue;
 			}
 
-			$testAttributes = $reflectionMethod->getAttributes('PHPUnit\Framework\Attributes\Test');
+			$testAttributes = $reflectionMethod->getAttributes('PHPUnit\Framework\Attributes\Test'); // @phpstan-ignore argument.type
 			if ($testAttributes === []) {
 				continue;
 			}

src/Rules/PHPUnit/TestMethodsHelperFactory.php

@@ -9,30 +9,23 @@
 class TestMethodsHelperFactory
 {
 
-	private ReflectionProvider $reflectionProvider;
 
 	private FileTypeMapper $fileTypeMapper;
 
-	private Parser $parser;
-
 	private PHPUnitVersionDetector $PHPUnitVersionDetector;
 
 	public function __construct(
-		ReflectionProvider $reflectionProvider,
 		FileTypeMapper $fileTypeMapper,
-		Parser $parser,
 		PHPUnitVersionDetector $PHPUnitVersionDetector
 	)
 	{
-		$this->reflectionProvider = $reflectionProvider;
 		$this->fileTypeMapper = $fileTypeMapper;
-		$this->parser = $parser;
 		$this->PHPUnitVersionDetector = $PHPUnitVersionDetector;
 	}
 
 	public function create(): TestMethodsHelper
 	{
-		return new TestMethodsHelper($this->reflectionProvider, $this->fileTypeMapper, $this->parser, $this->PHPUnitVersionDetector->isPHPUnit10OrNewer());
+		return new TestMethodsHelper($this->fileTypeMapper, $this->PHPUnitVersionDetector->isPHPUnit10OrNewer());
 	}
 
 }

tests/PHPStan/Rules/CompositeRule.php

@@ -8,6 +8,8 @@
 
 /**
  * @implements Rule<Node>
+ *
+ * @api
  */
 final class CompositeRule implements Rule
 {

tests/Rules/PHPUnit/DataProviderDataRuleTest.php

@@ -32,9 +32,7 @@ protected function getRule(): Rule
 		return new CompositeRule(new DirectRegistry([
 			new DataProviderDataRule(
 				new TestMethodsHelper(
-					$reflectionProvider,
 					self::getContainer()->getByType(FileTypeMapper::class),
-					self::getContainer()->getService('defaultAnalysisParser'),
 					true
 				),
 				new DataProviderHelper(