Merge branch 'hotfix/70'

Close #72
Fixes #70
Fixes #43

Author: weierophinney

CHANGELOG.md

@@ -27,6 +27,8 @@ All notable changes to this project will be documented in this file, in reverse
   how class names under the same namespace are generated when generating
   typehints, extends, and implements values; they now strip the
   common namespace from the class name.
+- [#72](https://github.com/zendframework/zend-code/pull/72) fixes an issue
+  within the `TokenArrayScanner` when scanning closures.
 
 ## 3.0.2 - 2016-04-20
 

src/Scanner/TokenArrayScanner.php

@@ -583,7 +583,9 @@ protected function scan()
                         && $infos[$infoIndex]['type'] === 'class'
                         || ($tokenType === T_FUNCTION && $infos[$infoIndex]['type'] === 'function'))
                 ) {
-                    $infos[$infoIndex]['shortName'] = $tokens[$tokenIndex + 2][1];
+                    $infos[$infoIndex]['shortName'] = is_array($tokens[$tokenIndex + 2])
+                        ? $tokens[$tokenIndex + 2][1]
+                        : $tokens[$tokenIndex + 2];
                     $infos[$infoIndex]['name']      = (($namespace !== null)
                         ? $namespace . '\\'
                         : '') . $infos[$infoIndex]['shortName'];

test/Reflection/FileReflectionTest.php

@@ -175,4 +175,16 @@ public function testFileCanReflectFileWithUses()
             ];
         $this->assertSame($expected, $reflectionFile->getUses());
     }
+
+    /**
+     * @group 70
+     * @group 43
+     */
+    public function testFileReflectionShouldNotRaiseNoticesWhenReflectingClosures()
+    {
+        require_once __DIR__ . '/TestAsset/issue-70.php';
+        $r = new FileReflection(__DIR__ . '/TestAsset/issue-70.php');
+        $this->assertContains('spl_autoload_register', $r->getContents());
+        $this->assertContains('function ()', $r->getContents());
+    }
 }

test/Reflection/TestAsset/issue-70.php

@@ -0,0 +1,9 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-code for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+spl_autoload_register(function () {
+});