PhpdocNoSuperfluousParamFixer - bug with typed param (#130)

Author: kubawerlos

README.md

@@ -8,7 +8,7 @@
 
 [![Build status](https://img.shields.io/travis/kubawerlos/php-cs-fixer-custom-fixers/master.svg)](https://travis-ci.org/kubawerlos/php-cs-fixer-custom-fixers)
 [![Code coverage](https://img.shields.io/coveralls/github/kubawerlos/php-cs-fixer-custom-fixers/master.svg)](https://coveralls.io/github/kubawerlos/php-cs-fixer-custom-fixers?branch=master)
-![Tests](https://img.shields.io/badge/tests-1076-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-1077-brightgreen.svg)
 [![Mutation testing badge](https://badge.stryker-mutator.io/github.com/kubawerlos/php-cs-fixer-custom-fixers/master)](https://stryker-mutator.github.io)
 
 A set of custom fixers for [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer).

src/Fixer/PhpdocNoSuperfluousParamFixer.php

@@ -95,18 +95,19 @@ private function getParamNames(Tokens $tokens, int $functionIndex): array
 
     private function getFilteredDocComment(string $comment, array $paramNames): string
     {
+        $regexParamNamesPattern = \implode('|', \array_map(static function (string $paramName): string {
+            return \preg_quote($paramName, '/');
+        }, $paramNames));
+
         $doc = new DocBlock($comment);
         $foundParamNames = [];
 
         foreach ($doc->getAnnotationsOfType('param') as $annotation) {
-            $regexParamNamesPattern = \implode('|', \array_map(static function (string $paramName): string {
-                return \preg_quote($paramName, '/');
-            }, $paramNames));
-
-            if (Preg::match(\sprintf('/@param\s+(?:[^\$](?:[^<\s]|<[^>]*>)*\s+)?(?:&|\.\.\.)?\s*(%s)\b/', $regexParamNamesPattern), $annotation->getContent(), $matches) === 1 && !isset($foundParamNames[$matches[1]])) {
+            if (Preg::match(\sprintf('/@param\s+(?:[^\$](?:[^<\s]|<[^>]*>)*\s+)?(?:&|\.\.\.)?\s*(?=\$)(%s)\b/', $regexParamNamesPattern), $annotation->getContent(), $matches) === 1 && !isset($foundParamNames[$matches[1]])) {
                 $foundParamNames[$matches[1]] = true;
                 continue;
             }
+
             $annotation->remove();
         }
 

tests/Fixer/PhpdocNoSuperfluousParamFixerTest.php

@@ -99,6 +99,20 @@ function foo($x) {}
         yield [
             '<?php
 /**
+ */
+function foo() {}
+',
+            '<?php
+/**
+ * @param int $x
+ */
+function foo() {}
+',
+        ];
+
+        yield [
+            '<?php
+/**
  * @param $x
  */
 /* private */ function foo($x) {}