refactor

Author: staabm

src/Rules/PHPUnit/AssertSameWithCountRule.php

@@ -41,18 +41,16 @@ public function processNode(Node $node, Scope $scope): array
 		if (!$node->name instanceof Node\Identifier	|| $node->name->toLowerString() !== 'assertsame') {
 			return [];
 		}
-		foreach ($node->getArgs() as $arg) {
-			if ($arg->name !== null) {
-				return [];
-			}
+		if (self::hasNamedArgs($node->getArgs())) {
+			return [];
 		}
 
 		if (!AssertRuleHelper::isMethodOrStaticCallOnAssert($node, $scope)) {
 			return [];
 		}
 
 		$right = $node->getArgs()[1]->value;
-		if (self::isCountFunctionCall($right, $scope)) {
+		if (self::isFixableCountFunctionCall($right, $scope)) {
 			return [
 				RuleErrorBuilder::message('You should use assertCount($expectedCount, $variable) instead of assertSame($expectedCount, count($variable)).')
 					->identifier('phpunit.assertCount')
@@ -71,7 +69,7 @@ public function processNode(Node $node, Scope $scope): array
 			];
 		}
 
-		if (self::isCountableMethodCall($right, $scope)) {
+		if (self::isFixableCountableMethodCall($right, $scope)) {
 			return [
 				RuleErrorBuilder::message('You should use assertCount($expectedCount, $variable) instead of assertSame($expectedCount, $variable->count()).')
 					->identifier('phpunit.assertCount')
@@ -96,7 +94,7 @@ public function processNode(Node $node, Scope $scope): array
 	/**
 	 * @phpstan-assert-if-true Node\Expr\FuncCall $expr
 	 */
-	private static function isCountFunctionCall(Node\Expr $expr, Scope $scope): bool
+	private static function isFixableCountFunctionCall(Node\Expr $expr, Scope $scope): bool
 	{
 		if (!$expr instanceof Node\Expr\FuncCall
 			|| !$expr->name instanceof Node\Name
@@ -106,10 +104,8 @@ private static function isCountFunctionCall(Node\Expr $expr, Scope $scope): bool
 		}
 
 		$args = $expr->getArgs();
-		foreach ($args as $arg) {
-			if ($arg->name !== null) {
-				return false;
-			}
+		if (self::hasNamedArgs($args)) {
+			return false;
 		}
 
 		return count($args) >= 1
@@ -119,7 +115,7 @@ private static function isCountFunctionCall(Node\Expr $expr, Scope $scope): bool
 	/**
 	 * @phpstan-assert-if-true Node\Expr\MethodCall $expr
 	 */
-	private static function isCountableMethodCall(Node\Expr $expr, Scope $scope): bool
+	private static function isFixableCountableMethodCall(Node\Expr $expr, Scope $scope): bool
 	{
 		if (
 			$expr instanceof Node\Expr\MethodCall
@@ -148,6 +144,20 @@ private static function isNormalCount(Node\Expr\FuncCall $countFuncCall, Type $c
 		return $isNormalCount;
 	}
 
+	/**
+	 * @param array<Node\Arg> $args
+	 */
+	private static function hasNamedArgs(array $args): bool
+	{
+		foreach ($args as $arg) {
+			if ($arg->name !== null) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * @template T of NodeAbstract
 	 * @param array<T> $args
@@ -163,17 +173,19 @@ private static function rewriteArgs(array $args, Scope $scope): ?array
 				&& $args[$i]->value instanceof CallLike
 			) {
 				$value = $args[$i]->value;
-				if (self::isCountFunctionCall($value, $scope)) {
+				if (self::isFixableCountFunctionCall($value, $scope)) {
 					if (count($value->getArgs()) !== 1) {
 						return null;
 					}
 
 					$newArgs[] = new Node\Arg($value->getArgs()[0]->value);
 					continue;
-				} elseif (self::isCountableMethodCall($value, $scope)) {
+				} elseif (self::isFixableCountableMethodCall($value, $scope)) {
 					$newArgs[] = new Node\Arg($value->var);
 					continue;
 				}
+
+				return null;
 			}
 
 			$newArgs[] = $args[$i];