Merge pull request #3 from moufmouf/passing_classnamemapper

Adding the possibility to pass a ClassNameMapper instance

Author: moufmouf

composer.json

@@ -31,6 +31,11 @@
             "TheCodingMachine\\ClassExplorer\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "TheCodingMachine\\ClassExplorer\\": "tests/"
+        }
+    },
     "extra": {
         "class": "TheCodingMachine\\ClassExplorer\\ClassExplorerPlugin",
         "branch-alias": {

src/Glob/GlobClassExplorer.php

@@ -36,12 +36,17 @@ class GlobClassExplorer implements ClassExplorerInterface
      * @var int|null
      */
     private $cacheTtl;
+    /**
+     * @var ClassNameMapper|null
+     */
+    private $classNameMapper;
 
-    public function __construct(string $namespace, CacheInterface $cache, ?int $cacheTtl = null)
+    public function __construct(string $namespace, CacheInterface $cache, ?int $cacheTtl = null, ?ClassNameMapper $classNameMapper = null)
     {
         $this->namespace = $namespace;
         $this->cache = $cache;
         $this->cacheTtl = $cacheTtl;
+        $this->classNameMapper = $classNameMapper;
     }
 
     /**
@@ -68,8 +73,10 @@ public function getClasses(): array
     private function doGetClasses(): array
     {
         $namespace = trim($this->namespace, '\\').'\\';
-        $mapper = ClassNameMapper::createFromComposerFile();
-        $files = $mapper->getPossibleFileNames($namespace.'XXX');
+        if ($this->classNameMapper === null) {
+            $this->classNameMapper = ClassNameMapper::createFromComposerFile();
+        }
+        $files = $this->classNameMapper->getPossibleFileNames($namespace.'XXX');
 
         $dirs = \array_map('dirname', $files);
 
@@ -88,7 +95,7 @@ private function doGetClasses(): array
 
     /**
      * @param string $directory
-     * @return RegexIterator
+     * @return \Iterator
      */
     private static function getPhpFilesForDir(string $directory): \Iterator
     {

tests/Glob/GlobClassExplorerTest.php

@@ -2,6 +2,7 @@
 
 namespace TheCodingMachine\ClassExplorer\Glob;
 
+use Mouf\Composer\ClassNameMapper;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Cache\Simple\NullCache;
 
@@ -15,6 +16,14 @@ public function testGetClasses()
         $this->assertSame([GlobClassExplorer::class], $classes);
     }
 
+    public function testGetDevClasses()
+    {
+        $explorer = new GlobClassExplorer('\\TheCodingMachine\\ClassExplorer\\Glob\\', new NullCache(), null, ClassNameMapper::createFromComposerFile(null, null, true));
+        $classes = $explorer->getClasses();
+
+        $this->assertSame([GlobClassExplorer::class, GlobClassExplorerTest::class], $classes);
+    }
+
     public function testGetNotExistingClasses()
     {
         $explorer = new GlobClassExplorer('\\TheCodingMachine\\ClassExplorer\\Glob\\Foobar\\', new NullCache());