PhpUnitDedicateAssertFixer - fix for count with additional operations

Author: kubawerlos

src/Fixer/PhpUnit/PhpUnitDedicateAssertFixer.php

@@ -352,7 +352,7 @@ private function fixAssertSameEquals(Tokens $tokens, array $assertCall)
             $defaultNamespaceTokenIndex = false;
         }
 
-        if (!$tokens[$countCallIndex]->isGivenKind(T_STRING) || 'count' !== strtolower($tokens[$countCallIndex]->getContent())) {
+        if (!$tokens[$countCallIndex]->equals([T_STRING, 'count'], false)) {
             return; // not a call to "count"
         }
 
@@ -362,12 +362,19 @@ private function fixAssertSameEquals(Tokens $tokens, array $assertCall)
             return;
         }
 
+        $countCallCloseBraceIndex = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $countCallOpenBraceIndex);
+
+        $afterCountCallCloseBraceIndex = $tokens->getNextMeaningfulToken($countCallCloseBraceIndex);
+        if (!$tokens[$afterCountCallCloseBraceIndex]->equalsAny([')', ','])) {
+            return;
+        }
+
         $this->removeFunctionCall(
             $tokens,
             $defaultNamespaceTokenIndex,
             $countCallIndex,
             $countCallOpenBraceIndex,
-            $tokens->findBlockEnd(Tokens::BLOCK_TYPE_PARENTHESIS_BRACE, $countCallOpenBraceIndex)
+            $countCallCloseBraceIndex
         );
 
         $tokens[$assertCall['index']] = new Token([

tests/Fixer/PhpUnit/PhpUnitDedicateAssertFixerTest.php

@@ -474,6 +474,11 @@ public function provideTestAssertCountCases()
                     $this->test(); // $this->assertSame($b, count($a));
                 ',
             ],
+            'do not fix 7' => [
+                '<?php
+                    $this->assertSame(2, count($array) - 1);
+                ',
+            ],
         ];
     }