update per PR

Author: tm1000

src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php

@@ -419,14 +419,14 @@ protected function processParams(File $phpcsFile, $stackPtr, $commentStart)
 
                 // Check type hint for array and custom type.
                 $suggestedTypeHint = '';
-                if (preg_match('/^(.*)<.*>$/', $suggestedName, $matches)) {
-                    $suggestedTypeHint = $matches[1];
-                } else if (strpos($suggestedName, 'array') !== false || substr($suggestedName, -2) === '[]') {
+                if (strpos($suggestedName, 'array') !== false || substr($suggestedName, -2) === '[]') {
                     $suggestedTypeHint = 'array';
                 } else if (strpos($suggestedName, 'callable') !== false) {
                     $suggestedTypeHint = 'callable';
                 } else if (strpos($suggestedName, 'callback') !== false) {
                     $suggestedTypeHint = 'callable';
+                } else if (preg_match('/^([^<]+)<[^>]+>$/', $suggestedName, $matches)) {
+                    $suggestedTypeHint = $matches[1];
                 } else if (in_array($suggestedName, Common::$allowedTypes, true) === false) {
                     $suggestedTypeHint = $suggestedName;
                 }

src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc

@@ -1055,6 +1055,6 @@ function throwCommentOneLine() {}
  *
  * @return void
  */
-public function specifiedArray1(Collection $values) {
+public function genericType(Collection $values) {
 
-}// end specifiedArray1()
+}// end genericType()

src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc.fixed

@@ -1055,6 +1055,6 @@ function throwCommentOneLine() {}
  *
  * @return void
  */
-public function specifiedArray1(Collection $values) {
+public function genericType(Collection $values) {
 
-}// end specifiedArray1()
+}// end genericType()