Merge branch 'hotfix/61' into develop

Forward port #61

Author: weierophinney

CHANGELOG.md

@@ -37,7 +37,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#61](https://github.com/zendframework/zend-code/pull/61) fixes an issue with
+  how parameter typehints were generated; previously, fully-qualified class
+  names were not being generated with the leading backslash, causing them to
+  attempt to resolve as if they were relative to the current namespace.
 
 ## 3.0.2 - 2016-04-20
 

src/Scanner/MethodScanner.php

@@ -522,6 +522,13 @@ protected function scan()
                 goto SCANNER_CONTINUE_SIGNATURE;
                 // goto (no break needed);
 
+            case T_NS_SEPARATOR:
+                if (!isset($infos[$infoIndex])) {
+                    $MACRO_INFO_START();
+                }
+                goto SCANNER_CONTINUE_SIGNATURE;
+                // goto (no break needed);
+
             case T_VARIABLE:
             case T_STRING:
                 if ($tokenType === T_STRING && $parentCount === 0) {

test/Scanner/ClassScannerTest.php

@@ -160,7 +160,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(37, $class->getLineEnd());
+        $this->assertEquals(42, $class->getLineEnd());
     }
 
     public function testClassScannerCanScanAnnotations()

test/Scanner/MethodScannerTest.php

@@ -48,6 +48,16 @@ public function testMethodScannerReturnsParameterScanner()
         $this->assertEquals('t', $parameter->getName());
     }
 
+    public function testMethodScannerParsesClassNames()
+    {
+        $file   = new FileScanner(__DIR__ . '/../TestAsset/BarClass.php');
+        $class  = $file->getClass('ZendTest\Code\TestAsset\BarClass');
+        $method = $class->getMethod('five');
+        $this->assertEquals(['a'], $method->getParameters());
+        $parameter = $method->getParameter('a');
+        $this->assertEquals('ZendTest\Code\TestAsset\AbstractClass', $parameter->getClass());
+    }
+
     public function testMethodScannerReturnsPropertyWithNoDefault()
     {
         $file  = new FileScanner(__DIR__ . '/../TestAsset/BazClass.php');

test/TestAsset/BarClass.php

@@ -34,4 +34,9 @@ protected function four($one, $two = array(array(array('default'))))
     {
         // four
     }
+
+    private function five(\ZendTest\Code\TestAsset\AbstractClass $a)
+    {
+        // five
+    }
 }