Issue #31: function::getArguments: fixed function name mistakenly use…

…d as typehint for first typehint-less argument
sebastianbergmann · Oct 21, 2013 · 5a54d90 · 5a54d90
1 parent 5220af2
commit 5a54d90
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/PHP/Token.php b/PHP/Token.php
@@ -376,10 +376,15 @@ public function getArguments()
         }
 
         $this->arguments = array();
-        $i               = $this->id + 2;
         $tokens          = $this->tokenStream->tokens();
         $typeHint        = NULL;
 
+        // Search for first token inside brackets
+        $i = $this->id + 2;
+        while (!$tokens[$i-1] instanceof PHP_Token_OPEN_BRACKET) {
+            $i++;
+        }
+
         while (!$tokens[$i] instanceof PHP_Token_CLOSE_BRACKET) {
             if ($tokens[$i] instanceof PHP_Token_STRING) {
                 $typeHint = (string)$tokens[$i];

diff --git a/Tests/Token/FunctionTest.php b/Tests/Token/FunctionTest.php
@@ -99,6 +99,8 @@ public function testGetArguments()
         );
 
         $this->assertEquals(array(), $this->functions[4]->getArguments());
+
+        $this->assertEquals(array('$x' => null, '$y' => null), $this->functions[5]->getArguments());
     }
 
     /**

diff --git a/Tests/_files/source.php b/Tests/_files/source.php
@@ -29,4 +29,8 @@ public function barfoo(Barfoo $barfoo)
     public function baz()
     {
     }
+
+    public function blaz($x, $y)
+    {
+    }
 }