PhpUnitAssertArgumentsOrderFixer - support "greater"/"less" assertions (#640)

Author: kubawerlos

README.md

@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-2981-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-2985-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

src/Fixer/PhpUnitAssertArgumentsOrderFixer.php

@@ -18,23 +18,28 @@
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
 use PhpCsFixer\Indicator\PhpUnitTestCaseIndicator;
 use PhpCsFixer\Tokenizer\Analyzer\FunctionsAnalyzer;
+use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 use PhpCsFixerCustomFixers\Analyzer\Analysis\ArgumentAnalysis;
 use PhpCsFixerCustomFixers\Analyzer\FunctionAnalyzer;
 
 final class PhpUnitAssertArgumentsOrderFixer extends AbstractFixer
 {
     private const ASSERTIONS = [
-        'assertEquals',
-        'assertEqualsCanonicalizing',
-        'assertEqualsIgnoringCase',
-        'assertEqualsWithDelta',
-        'assertNotEquals',
-        'assertNotEqualsCanonicalizing',
-        'assertNotEqualsIgnoringCase',
-        'assertNotEqualsWithDelta',
-        'assertNotSame',
-        'assertSame',
+        'assertEquals' => true,
+        'assertNotEquals' => true,
+        'assertEqualsCanonicalizing' => true,
+        'assertNotEqualsCanonicalizing' => true,
+        'assertEqualsIgnoringCase' => true,
+        'assertNotEqualsIgnoringCase' => true,
+        'assertEqualsWithDelta' => true,
+        'assertNotEqualsWithDelta' => true,
+        'assertSame' => true,
+        'assertNotSame' => true,
+        'assertGreaterThan' => 'assertLessThan',
+        'assertGreaterThanOrEqual' => 'assertLessThanOrEqual',
+        'assertLessThan' => 'assertGreaterThan',
+        'assertLessThanOrEqual' => 'assertGreaterThanOrEqual',
     ];
 
     public function getDefinition(): FixerDefinitionInterface
@@ -84,7 +89,8 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
     private function fixArgumentsOrder(Tokens $tokens, int $startIndex, int $endIndex): void
     {
         for ($index = $startIndex; $index < $endIndex; $index++) {
-            if (!self::isAssertionCall($tokens, $index)) {
+            $newAssertion = self::getNewAssertion($tokens, $index);
+            if ($newAssertion === null) {
                 continue;
             }
 
@@ -94,37 +100,50 @@ private function fixArgumentsOrder(Tokens $tokens, int $startIndex, int $endInde
                 continue;
             }
 
+            if ($newAssertion !== $tokens[$index]->getContent()) {
+                $tokens[$index] = new Token([\T_STRING, $newAssertion]);
+            }
+
             self::swapArguments($tokens, $arguments);
         }
     }
 
-    private static function isAssertionCall(Tokens $tokens, int $index): bool
+    private static function getNewAssertion(Tokens $tokens, int $index): ?string
     {
+        /** @var null|array<string, bool|string> $assertions */
         static $assertions;
 
         if ($assertions === null) {
-            $assertions = \array_flip(
-                \array_map(
-                    static function (string $name): string {
-                        return \strtolower($name);
-                    },
-                    self::ASSERTIONS
-                )
-            );
+            $assertions = [];
+            foreach (self::ASSERTIONS as $old => $new) {
+                $assertions[\strtolower($old)] = $new;
+            }
         }
 
-        if (!isset($assertions[\strtolower($tokens[$index]->getContent())])) {
-            return false;
+        $oldAssertion = $tokens[$index]->getContent();
+
+        if (!isset($assertions[\strtolower($oldAssertion)])) {
+            return null;
         }
 
+        $newAssertion = $assertions[\strtolower($oldAssertion)];
+
         /** @var int $openingBraceIndex */
         $openingBraceIndex = $tokens->getNextMeaningfulToken($index);
 
         if (!$tokens[$openingBraceIndex]->equals('(')) {
-            return false;
+            return null;
+        }
+
+        if (!(new FunctionsAnalyzer())->isTheSameClassCall($tokens, $index)) {
+            return null;
+        }
+
+        if (!\is_string($newAssertion)) {
+            return $oldAssertion;
         }
 
-        return (new FunctionsAnalyzer())->isTheSameClassCall($tokens, $index);
+        return $newAssertion;
     }
 
     /**

tests/Fixer/PhpUnitAssertArgumentsOrderFixerTest.php

@@ -105,6 +105,26 @@ private static function getFixCases(): iterable
             'self::assertSame($x, 1, "Message");',
         ];
 
+        yield [
+            'self::assertGreaterThan(1, $x);',
+            'self::assertLessThan($x, 1);',
+        ];
+
+        yield [
+            'self::assertLessThan(1, $x);',
+            'self::assertGreaterThan($x, 1);',
+        ];
+
+        yield [
+            'self::assertGreaterThanOrEqual(1, $x);',
+            'self::assertLessThanOrEqual($x, 1);',
+        ];
+
+        yield [
+            'self::assertLessThanOrEqual(1, $x);',
+            'self::assertGreaterThanOrEqual($x, 1);',
+        ];
+
         yield [
             '$this->ASSERTSAME(1, $x);',
             '$this->ASSERTSAME($x, 1);',