Fix type coverage back to 100% (#654)

Author: kubawerlos

.dev-tools/psalm.xml

@@ -5,11 +5,9 @@
        xsi:schemaLocation='https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd'
        allowStringToStandInForClass='true'
        autoloader='../vendor/autoload.php'
-       findUnusedCode='false'
+       errorLevel='1'
        findUnusedVariablesAndParams='true'
-       resolveFromConfigFile='true'
        strictBinaryOperands='true'
-       totallyTyped='true'
        usePhpDocMethodsWithoutMagicCall='true'
 >
     <projectFiles>

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-3032-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3029-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/PhpUnitDedicatedAssertFixer.php

@@ -26,10 +26,10 @@
 final class PhpUnitDedicatedAssertFixer extends AbstractFixer
 {
     private const ASSERTIONS = [
-        'assertEquals',
-        'assertNotEquals',
-        'assertSame',
-        'assertNotSame',
+        'assertequals' => true,
+        'assertnotequals' => true,
+        'assertsame' => true,
+        'assertnotsame' => true,
     ];
     private const REPLACEMENTS_MAP = [
         'count' => [
@@ -110,20 +110,7 @@ private function fixAssertions(Tokens $tokens, int $startIndex, int $endIndex):
 
     private static function isAssertionToFix(Tokens $tokens, int $index): bool
     {
-        static $assertions;
-
-        if ($assertions === null) {
-            $assertions = \array_flip(
-                \array_map(
-                    static function (string $name): string {
-                        return \strtolower($name);
-                    },
-                    self::ASSERTIONS
-                )
-            );
-        }
-
-        if (!isset($assertions[\strtolower($tokens[$index]->getContent())])) {
+        if (!isset(self::ASSERTIONS[\strtolower($tokens[$index]->getContent())])) {
             return false;
         }
 

tests/Fixer/PhpUnitDedicatedAssertFixerTest.php

@@ -13,8 +13,6 @@
 
 namespace Tests\Fixer;
 
-use PhpCsFixerCustomFixers\Fixer\PhpUnitDedicatedAssertFixer;
-
 /**
  * @internal
  *
@@ -111,23 +109,20 @@ private static function getFixCases(): iterable
             '$this->assertSame ( 3 , \count ( $array ) ) ;',
         ];
 
-        $reflection = new \ReflectionClass(PhpUnitDedicatedAssertFixer::class);
-
-        /** @var array<string> $assertions */
-        $assertions = $reflection->getConstant('ASSERTIONS');
-
-        foreach ($assertions as $assertion) {
-            $expected = 'self::assertCount(3, $array);';
-            $input = \sprintf('self::%s(3, count($array));', $assertion);
-
-            if (\stripos($assertion, 'Not', 6) !== false) {
-                $expected = \str_replace('assert', 'assertNot', $expected);
-                $expected = \str_replace('3', '4', $expected);
-                $input = \str_replace('3', '4', $input);
-            }
-
-            yield \sprintf('Test assertion "%s"', $assertion) => [$expected, $input];
-        }
+        yield 'fix all four assertions' => [
+            '
+                self::assertCount($count, $array);
+                self::assertCount($count, $array);
+                self::assertNotCount($count, $array);
+                self::assertNotCount($count, $array);
+            ',
+            '
+                self::assertEquals($count, count($array));
+                self::assertSame($count, count($array));
+                self::assertNotEquals($count, count($array));
+                self::assertNotSame($count, count($array));
+            ',
+        ];
 
         yield 'fix multiple assertions' => [
             '