Fixed MethodScanner that on latest prm value fails

Unit test for this case added anyway
zendframework · Sep 16, 2013 · 86fead2 · 86fead2
1 parent 3bd643a
commit 86fead2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/library/Zend/Code/Scanner/MethodScanner.php b/library/Zend/Code/Scanner/MethodScanner.php
@@ -490,6 +490,9 @@ protected function scan()
                         goto SCANNER_CONTINUE_SIGNATURE;
                     case ')':
                         $parentCount--;
+                        if($parentCount > 0) {
+                            goto SCANNER_CONTINUE_SIGNATURE;
+                        }
                         if ($parentCount === 0) {
                             if ($infos) {
                                 $MACRO_INFO_ADVANCE();

diff --git a/tests/ZendTest/Code/Scanner/ClassScannerTest.php b/tests/ZendTest/Code/Scanner/ClassScannerTest.php
@@ -159,7 +159,7 @@ public function testClassScannerCanReturnLineNumbers()
         $file    = new FileScanner(__DIR__ . '/../TestAsset/BarClass.php');
         $class   = $file->getClass('ZendTest\Code\TestAsset\BarClass');
         $this->assertEquals(10, $class->getLineStart());
-        $this->assertEquals(33, $class->getLineEnd());
+        $this->assertEquals(37, $class->getLineEnd());
     }
 
     public function testClassScannerCanScanAnnotations()

diff --git a/tests/ZendTest/Code/Scanner/MethodScannerTest.php b/tests/ZendTest/Code/Scanner/MethodScannerTest.php
@@ -75,4 +75,13 @@ public function testMethodScannerReturnsBodyMethods()
         $this->assertEquals($expected, $method->getBody());
     }
 
+    public function testMethodScannerMethodSignatureLatestOptionalParamHasParentheses()
+    {
+        $file       = new FileScanner(__DIR__ . '/../TestAsset/BarClass.php');
+        $class      = $file->getClass('ZendTest\Code\TestAsset\BarClass');
+        $method = $class->getMethod('four');
+        $paramTwo = $method->getParameter(1);
+        $optionalValue = $paramTwo->getDefaultValue();
+        $this->assertEquals('array(array(array(\'default\')))', trim($optionalValue));
+    }
 }
diff --git a/tests/ZendTest/Code/TestAsset/BarClass.php b/tests/ZendTest/Code/TestAsset/BarClass.php
@@ -30,4 +30,8 @@ protected function three(\ArrayObject $o, &$t = 2, FooBarBaz\BazBarFoo $bbf = se
         $y = 'this string';
     }
 
+    protected function four($one, $two = array(array(array('default'))))
+    {
+        // four
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             $y = 'this string';
         }
+        protected function four($one, $two = array(array(array('default'))))
+        {
+            // four
+        }
     }