Merge pull request #6 from phpactor/simple_improve

Simple improve

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());
             }
         }
 

tests/Integration/Simple/SimpleClassToFileTest.php

@@ -33,6 +33,15 @@ public function testClassToFile()
         ]), $candidates);
     }
 
+    public function testClassToFileDeeper()
+    {
+        $candidates = $this->classToFile->classToFileCandidates(ClassName::fromString('Acme\\NamespaceHere\\Hallo'));
+
+        $this->assertEquals(FilePathCandidates::fromFilePaths([
+            FilePath::fromString(__DIR__ . '/../workspace/lib/NamespaceHere/Hallo.php')
+        ]), $candidates);
+    }
+
     public function testClassToNoCandidates()
     {
         $candidates = $this->classToFile->classToFileCandidates(ClassName::fromString('Zog\\Foobar'));

tests/Integration/Simple/SimpleFileToClassTest.php

@@ -32,6 +32,24 @@ public function testFileToClass()
         ]), $candidates);
     }
 
+    public function testFileToInterface()
+    {
+        $candidates = $this->fileToClass->fileToClassCandidates(FilePath::fromString(__DIR__ . '/project/lib/FoobarInterface.php'));
+
+        $this->assertEquals(ClassNameCandidates::fromClassNames([
+            ClassName::fromString('Acme\\FoobarInterface')
+        ]), $candidates);
+    }
+
+    public function testFileToTrait()
+    {
+        $candidates = $this->fileToClass->fileToClassCandidates(FilePath::fromString(__DIR__ . '/project/lib/FoobarTrait.php'));
+
+        $this->assertEquals(ClassNameCandidates::fromClassNames([
+            ClassName::fromString('Acme\\FoobarTrait')
+        ]), $candidates);
+    }
+
     public function testFileToNoCandidates()
     {
         $candidates = $this->fileToClass->fileToClassCandidates(FilePath::fromString(__DIR__ . '/project/lib/NoClasses.php'));

tests/Integration/Simple/project/lib/FoobarInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Acme;
+
+interface FoobarInterface
+{
+}

tests/Integration/Simple/project/lib/FoobarTrait.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Acme;
+
+trait FoobarTrait
+{
+}

tests/Integration/Simple/project/lib/NamespaceHere/Hallo.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Acme\NamespaceHere;
+
+class Hallo
+{
+}