fix: review comments

Author: mitelg

rules.neon

@@ -13,7 +13,7 @@ conditionalTags:
 	PHPStan\Rules\PHPUnit\AssertEqualsIsDiscouragedRule:
 		phpstan.rules.rule: [%strictRulesInstalled%, %featureToggles.bleedingEdge%]
 	PHPStan\Rules\PHPUnit\AssertEmptyIsDiscouragedRule:
-		phpstan.rules.rule: %strictRulesInstalled%
+		phpstan.rules.rule: [%strictRulesInstalled%, %featureToggles.bleedingEdge%]
 
 	PHPStan\Rules\PHPUnit\DataProviderDataRule:
 		phpstan.rules.rule: %featureToggles.bleedingEdge%

src/Rules/PHPUnit/AssertEmptyIsDiscouragedRule.php

@@ -8,14 +8,12 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
-use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
 use function count;
 use function in_array;
 use function sprintf;
-use function strtolower;
 
 /**
  * @implements Rule<CallLike>
@@ -34,26 +32,19 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if ($node instanceof MethodCall || $node instanceof StaticCall) {
-			if (!$node->name instanceof Identifier || !in_array($node->name->toLowerString(), ['assertempty', 'assertnotempty'], true)) {
-				return [];
-			}
-			if (!AssertRuleHelper::isMethodOrStaticCallOnAssert($node, $scope)) {
-				return [];
-			}
-		} elseif ($node instanceof FuncCall) {
-			if (!$node->name instanceof Name || !in_array(strtolower($scope->resolveName($node->name)), ['phpunit\\framework\\assertempty', 'phpunit\\framework\\assertnotempty'], true)) {
-				return [];
-			}
-		} else {
+		if (!($node instanceof MethodCall) && !($node instanceof StaticCall)) {
+			return [];
+		}
+
+		if (!$node->name instanceof Identifier || !in_array($node->name->toLowerString(), ['assertempty', 'assertnotempty'], true)) {
+			return [];
+		}
+		if (!AssertRuleHelper::isMethodOrStaticCallOnAssert($node, $scope)) {
 			return [];
 		}
 
 		return [
-			RuleErrorBuilder::message(sprintf(
-				'%s() is not allowed. Use more strict assertion.',
-				$node instanceof FuncCall ? $node->name->getLast() : $node->name->toString(),
-			))
+			RuleErrorBuilder::message(sprintf('%s() is not allowed. Use more strict assertion.', $node->name->toString()))
 				->identifier('empty.notAllowed')
 				->build(),
 		];

tests/Rules/PHPUnit/AssertEmptyIsDiscouragedRuleTest.php

@@ -14,12 +14,10 @@ final class AssertEmptyIsDiscouragedRuleTest extends RuleTestCase
 	public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/assert-empty-is-discouraged.php'], [
+			['assertEmpty() is not allowed. Use more strict assertion.', 13],
+			['assertNotEmpty() is not allowed. Use more strict assertion.', 14],
 			['assertEmpty() is not allowed. Use more strict assertion.', 15],
 			['assertNotEmpty() is not allowed. Use more strict assertion.', 16],
-			['assertEmpty() is not allowed. Use more strict assertion.', 17],
-			['assertNotEmpty() is not allowed. Use more strict assertion.', 18],
-			['assertEmpty() is not allowed. Use more strict assertion.', 19],
-			['assertNotEmpty() is not allowed. Use more strict assertion.', 20],
 		]);
 	}
 

tests/Rules/PHPUnit/data/assert-empty-is-discouraged.php

@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
-use function PHPUnit\Framework\assertEmpty;
-use function PHPUnit\Framework\assertNotEmpty;
 
 final class AssertEmptyTest extends TestCase
 {
@@ -16,8 +14,6 @@ public function test(): void
 		$this->assertNotEmpty([1]);
 		Assert::assertEmpty([]);
 		static::assertNotEmpty([1]);
-		assertEmpty([]);
-		assertNotEmpty([1]);
 	}
 
 }