Imporved simple location

Author: dantleech

lib/Adapter/Simple/ClassScanner.php

@@ -46,7 +46,8 @@ public function getClassNameFromFile($file)
                     }
                 }
 
-                if ($tokens[$i][0] === \T_CLASS) {
+                $token = $tokens[$i][0];
+                if ($token === \T_INTERFACE || $token === \T_CLASS || $token === \T_TRAIT) {
                     for ($j = $i + 1; $j < count($tokens); $j++) {
                         if ($tokens[$j][0] === \T_STRING) {
                             $class = $tokens[$i + 2][1];

lib/Adapter/Simple/SimpleClassToFile.php

@@ -6,6 +6,9 @@
 use Phpactor\ClassFileConverter\Domain\FilePathCandidates;
 use Phpactor\ClassFileConverter\Domain\ClassName;
 use Phpactor\ClassFileConverter\Domain\FilePath;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use RegexIterator;
 
 class SimpleClassToFile implements ClassToFile
 {
@@ -29,15 +32,19 @@ public function classToFileCandidates(ClassName $className): FilePathCandidates
     {
         $candidates = [];
         $pattern = sprintf(
-            '%s/**/%s.php',
-            $this->cwd,
+            '{^.*/%s.php$}',
             $className->name()
         );
-        foreach (glob($pattern) as $phpFile) {
+
+        $iterator = new RecursiveDirectoryIterator($this->cwd);
+        $iterator = new RecursiveIteratorIterator($iterator);
+        $iterator = new RegexIterator($iterator, $pattern);
+
+        foreach ($iterator as $phpFile) {
             if (ClassName::fromString(
-                $this->classScanner->getClassNameFromFile($phpFile)
+                $this->classScanner->getClassNameFromFile($phpFile->getPathName())
             ) == $className) {
-                $candidates[] = FilePath::fromString($phpFile);
+            $candidates[] = FilePath::fromString($phpFile->getPathName());
             }
         }