Merge branch 'hotfix/44'

Close #44

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.8.1 - TBD
+## 2.8.1 - 2018-05-01
 
 ### Added
 
@@ -22,7 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#44](https://github.com/zendframework/zend-file/pull/44) fixes an issue where
+  ClassFileLocator would skip the file (otherwise valid class file) containing a
+  `use function` declaration.
 
 ## 2.8.0 - 2018-04-25
 

src/ClassFileLocator.php

@@ -126,7 +126,10 @@ public function accept()
                     }
                     break;
                 case T_FUNCTION:
-                    $inFunctionDeclaration = true;
+                    // `use function` should not enter function context
+                    if ($i < 2 || ! is_array($tokens[$i - 2]) || $tokens[$i - 2][0] !== T_USE) {
+                        $inFunctionDeclaration = true;
+                    }
                     break;
                 case T_TRAIT:
                 case T_CLASS:

test/ClassFileLocatorTest.php

@@ -196,4 +196,17 @@ public function testIgnoresMethodsNamedAfterKeywords()
 
         $this->assertEquals($expected, $classNames, '', 0.0, 10, true);
     }
+
+    public function testIterationFindsClassInAFileWithUseFunction()
+    {
+        $locator = new ClassFileLocator(__DIR__);
+        $found = false;
+
+        foreach ($locator as $file) {
+            if (preg_match('/ContainsUseFunction\.php$/', $file->getFilename())) {
+                $found = true;
+            }
+        }
+        $this->assertTrue($found, "Failed to find a file that contains `use function`");
+    }
 }

test/TestAsset/ContainsUseFunction.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-file for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-file/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\File\TestAsset;
+
+use function strlen;
+
+class ContainsUseFunction
+{
+
+}