cs

Author: staabm

src/Rules/PHPUnit/DataProviderDataRule.php

@@ -2,26 +2,27 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
-use LogicException;
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
 use PHPUnit\Framework\TestCase;
+use function count;
 
 /**
  * @implements Rule<Node\Stmt\Return_>
  */
 class DataProviderDataRule implements Rule
 {
+
 	private ReflectionProvider $reflectionProvider;
 
 	private TestMethodsHelper $testMethodsHelper;
 
 	public function __construct(
 		ReflectionProvider $reflectionProvider,
-		TestMethodsHelper $testMethodsHelper,
+		TestMethodsHelper $testMethodsHelper
 	)
 	{
 		$this->reflectionProvider = $reflectionProvider;
@@ -64,10 +65,8 @@ public function processNode(Node $node, Scope $scope): array
 
 		$testsWithProvider = [];
 		$testMethods = $this->testMethodsHelper->getTestMethods($classReflection);
-		foreach($testMethods as $testMethod)
-		{
-			foreach($this->testMethodsHelper->getDataProviderMethods($scope, $testMethod, $classReflection) as [$providerMethod])
-			{
+		foreach ($testMethods as $testMethod) {
+			foreach ($this->testMethodsHelper->getDataProviderMethods($scope, $testMethod, $classReflection) as [$providerMethod]) {
 				if ($providerMethod === $method->getName()) {
 					$testsWithProvider[] = $testMethod;
 					continue 2;
@@ -79,7 +78,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		foreach($node->expr->items as $item) {
+		foreach ($node->expr->items as $item) {
 			if (!$item->value instanceof Node\Expr\Array_) {
 				return [];
 			}
@@ -90,7 +89,7 @@ public function processNode(Node $node, Scope $scope): array
 				$var,
 				$testsWithProvider[0]->getName(),
 				$args,
-				['startLine' => $item->getStartLine()]
+				['startLine' => $item->getStartLine()],
 			));
 		}
 
@@ -100,10 +99,11 @@ public function processNode(Node $node, Scope $scope): array
 	/**
 	 * @return array<Node\Arg>
 	 */
-	private function arrayItemsToArgs(Node\Expr\Array_ $array): ?array {
+	private function arrayItemsToArgs(Node\Expr\Array_ $array): ?array
+	{
 		$args = [];
 
-		foreach($array->items as $item) {
+		foreach ($array->items as $item) {
 			// XXX named args
 			$value = $item->value;
 

src/Rules/PHPUnit/TestMethodsHelper.php

@@ -2,26 +2,19 @@
 
 namespace PHPStan\Rules\PHPUnit;
 
-use PhpParser\Node;
-use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
-use PHPStan\Node\ClassMethod;
 use PHPStan\Parser\Parser;
-use PHPStan\PhpDoc\ResolvedPhpDocBlock;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Rules\IdentifierRuleError;
-use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Type\FileTypeMapper;
 use ReflectionMethod;
-use function array_merge;
-use function explode;
-use function sprintf;
-use function strpos;
+use function count;
+use function str_starts_with;
+use function strtolower;
 
 final class TestMethodsHelper
 {
+
 	private ReflectionProvider $reflectionProvider;
 
 	private FileTypeMapper $fileTypeMapper;
@@ -45,7 +38,7 @@ public function __construct(
 	public function getTestMethods(ClassReflection $class): array
 	{
 		$testMethods = [];
-		foreach($class->getNativeReflection()->getMethods() as $reflectionMethod) {
+		foreach ($class->getNativeReflection()->getMethods() as $reflectionMethod) {
 			if (str_starts_with(strtolower($reflectionMethod->getName()), 'test')) {
 				$testMethods[] = $reflectionMethod;
 				continue;
@@ -54,9 +47,11 @@ public function getTestMethods(ClassReflection $class): array
 			// todo: detect tests with @test annotation
 
 			$testAttributes = $reflectionMethod->getAttributes('PHPUnit\Framework\Attribute\Test');
-			if ($testAttributes !== []) {
-				$testMethods[] = $reflectionMethod;
+			if ($testAttributes === []) {
+				continue;
 			}
+
+			$testMethods[] = $reflectionMethod;
 		}
 
 		return $testMethods;
@@ -66,9 +61,9 @@ public function getTestMethods(ClassReflection $class): array
 	 * @return iterable<array{string}>
 	 */
 	public function getDataProviderMethods(
-		Scope                            $scope,
+		Scope $scope,
 		ReflectionMethod $node,
-		ClassReflection                  $classReflection
+		ClassReflection $classReflection
 	): iterable
 	{
 		/*

tests/PHPStan/Rules/CompositeRule.php

@@ -1,14 +1,18 @@
-<?php
+<?php declare(strict_types = 1);
 
 namespace PHPStan\Rules;
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use function get_class;
+
+class CompositeRule implements Rule
+{
 
-class CompositeRule implements Rule {
 	private DirectRegistry $registry;
 
-	public function __construct(DirectRegistry $ruleRegisty) {
+	public function __construct(DirectRegistry $ruleRegisty)
+	{
 		$this->registry = $ruleRegisty;
 	}
 
@@ -31,4 +35,5 @@ public function processNode(Node $node, Scope $scope): array
 
 		return $errors;
 	}
+
 }