FunctionsAnalyzer: fix for comment in type

Author: kubawerlos

src/Tokenizer/Analyzer/FunctionsAnalyzer.php

@@ -82,11 +82,11 @@ public function getFunctionReturnType(Tokens $tokens, $methodIndex)
         }
 
         $type = '';
-        $typeStartIndex = $tokens->getNextNonWhitespace($typeColonIndex);
+        $typeStartIndex = $tokens->getNextMeaningfulToken($typeColonIndex);
         $typeEndIndex = $typeStartIndex;
         $functionBodyStart = $tokens->getNextTokenOfKind($typeColonIndex, ['{', ';']);
         for ($i = $typeStartIndex; $i < $functionBodyStart; ++$i) {
-            if ($tokens[$i]->isWhitespace()) {
+            if ($tokens[$i]->isWhitespace() || $tokens[$i]->isComment()) {
                 continue;
             }
 

tests/Tokenizer/Analyzer/FunctionsAnalyzerTest.php

@@ -213,6 +213,30 @@ public function provideFunctionsWithArgumentsCases()
                     )
                 ),
             ]],
+            ['<?php function(\Foo\Bar $a){};', 1, [
+                '$a' => new ArgumentAnalysis(
+                    '$a',
+                    8,
+                    null,
+                    new TypeAnalysis(
+                        '\Foo\Bar',
+                        3,
+                        6
+                    )
+                ),
+            ]],
+            ['<?php function(\Foo/** TODO: change to something else */\Bar $a){};', 1, [
+                '$a' => new ArgumentAnalysis(
+                    '$a',
+                    9,
+                    null,
+                    new TypeAnalysis(
+                        '\Foo\Bar',
+                        3,
+                        7
+                    )
+                ),
+            ]],
         ];
     }
 
@@ -222,6 +246,8 @@ public function provideFunctionsWithReturnTypeCases()
             ['<?php function(){};', 1, null],
             ['<?php function($a): array {};', 1, new TypeAnalysis('array', 7, 7)],
             ['<?php function($a): \Foo\Bar {};', 1, new TypeAnalysis('\Foo\Bar', 7, 10)],
+            ['<?php function($a): /* not sure if really an array */array {};', 1, new TypeAnalysis('array', 8, 8)],
+            ['<?php function($a): \Foo/** TODO: change to something else */\Bar {};', 1, new TypeAnalysis('\Foo\Bar', 7, 11)],
         ];
     }
 }