fix: iterate psr-0/4 fallback dirs in composer finders (fixes #22)

composer.json

@@ -43,10 +43,12 @@
             "Kcs\\ClassFinder\\Benchmark\\": "bench/",
             "Kcs\\ClassFinder\\Tests\\": "tests/",
             "Kcs\\ClassFinder\\Fixtures\\Psr4\\": "data/Composer/Psr4/",
-            "Kcs\\ClassFinder\\Fixtures\\Psr4WithClassMap\\": "data/Psr4WithClassMap/"
+            "Kcs\\ClassFinder\\Fixtures\\Psr4WithClassMap\\": "data/Psr4WithClassMap/",
+            "": "data/Composer/Psr4Fallback"
         },
         "psr-0": {
-            "Kcs\\ClassFinder\\Fixtures\\Psr0\\": "data/Composer/Psr0/"
+            "Kcs\\ClassFinder\\Fixtures\\Psr0\\": "data/Composer/Psr0/",
+            "": "data/Composer/Psr0Fallback"
         },
         "classmap": [
             "data/Psr4WithClassMap/Map"

data/Composer/Psr0Fallback/Logger.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+class Logger implements LoggerInterface
+{
+}

data/Composer/Psr0Fallback/LoggerInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+interface LoggerInterface
+{
+}

data/Composer/Psr4Fallback/Logger4.php

@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+class Logger4 implements LoggerInterface
+{
+}

lib/Iterator/ComposerIterator.php

@@ -80,5 +80,23 @@ private function searchInPsrMap(): Generator
                 yield from $itr;
             }
         }
+
+        foreach ($this->classLoader->getFallbackDirsPsr4() as $dir) {
+            $itr = new Psr4Iterator('', $dir, $this->reflectorFactory, $this->flags, $this->classLoader->getClassMap(), $this->excludeNamespaces, $this->pathCallback);
+            if (isset($this->fileFinder)) {
+                $itr->setFileFinder($this->fileFinder);
+            }
+
+            yield from $itr;
+        }
+
+        foreach ($this->classLoader->getFallbackDirs() as $dir) {
+            $itr = new Psr0Iterator('', $dir, $this->reflectorFactory, $this->flags, $this->classLoader->getClassMap(), $this->excludeNamespaces, $this->pathCallback);
+            if (isset($this->fileFinder)) {
+                $itr->setFileFinder($this->fileFinder);
+            }
+
+            yield from $itr;
+        }
     }
 }

lib/Iterator/FilteredComposerIterator.php

@@ -142,6 +142,28 @@ private function searchInPsrMap(): Generator
 
             yield from $itr;
         }
+
+        if (! $this->validNamespace('')) {
+            return;
+        }
+
+        foreach ($this->classLoader->getFallbackDirsPsr4() as $dir) {
+            $itr = new Psr4Iterator('', $dir, $this->reflectorFactory, $this->flags, $this->classLoader->getClassMap(), $this->excludeNamespaces, $this->pathCallback);
+            if (isset($this->fileFinder)) {
+                $itr->setFileFinder($this->fileFinder);
+            }
+
+            yield from $itr;
+        }
+
+        foreach ($this->classLoader->getFallbackDirs() as $dir) {
+            $itr = new Psr0Iterator('', $dir, $this->reflectorFactory, $this->flags, $this->classLoader->getClassMap(), $this->excludeNamespaces, $this->pathCallback);
+            if (isset($this->fileFinder)) {
+                $itr->setFileFinder($this->fileFinder);
+            }
+
+            yield from $itr;
+        }
     }
 
     /** @param array<string, string[]|string> $prefixes */

tests/unit/Finder/ComposerFinderTest.php

@@ -8,6 +8,9 @@
 use Kcs\ClassFinder\Fixtures\Psr0;
 use Kcs\ClassFinder\Fixtures\Psr4;
 use Kcs\ClassFinder\Fixtures\Psr4WithClassMap;
+use Logger;
+use Logger4;
+use LoggerInterface;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Symfony\Component\ErrorHandler\DebugClassLoader as ErrorHandlerClassLoader;
@@ -74,6 +77,8 @@ public function testFinderShouldFilterByDirectory(): void
             Psr0\BarBar::class => new ReflectionClass(Psr0\BarBar::class),
             Psr0\Foobar::class => new ReflectionClass(Psr0\Foobar::class),
             Psr0\SubNs\FooBaz::class => new ReflectionClass(Psr0\SubNs\FooBaz::class),
+            Logger::class => new ReflectionClass(Logger::class),
+            LoggerInterface::class => new ReflectionClass(LoggerInterface::class),
         ], iterator_to_array($finder));
     }
 
@@ -97,6 +102,15 @@ public function testFinderShouldFilterByInterfaceImplementation(): void
             Psr4\BarBar::class => new ReflectionClass(Psr4\BarBar::class),
             Psr0\BarBar::class => new ReflectionClass(Psr0\BarBar::class),
         ], iterator_to_array($finder));
+
+        $finder = (new ComposerFinder())->useAutoloading(false);
+        $finder->in([__DIR__ . '/../../../data']);
+        $finder->implementationOf(LoggerInterface::class);
+
+        self::assertEquals([
+            Logger4::class => new ReflectionClass(Logger4::class),
+            Logger::class => new ReflectionClass(Logger::class),
+        ], iterator_to_array($finder));
     }
 
     public function testFinderShouldFilterBySuperClass(): void
@@ -187,6 +201,9 @@ public function testFinderShouldFilterByNotPath(): void
             Psr0\BarBar::class => new ReflectionClass(Psr0\BarBar::class),
             Psr0\Foobar::class => new ReflectionClass(Psr0\Foobar::class),
             Psr4WithClassMap\BarBar::class => new ReflectionClass(Psr4WithClassMap\BarBar::class),
+            Logger4::class => new ReflectionClass(Logger4::class),
+            Logger::class => new ReflectionClass(Logger::class),
+            LoggerInterface::class => new ReflectionClass(LoggerInterface::class),
         ], iterator_to_array($finder));
     }
 
@@ -205,6 +222,9 @@ public function testFinderShouldFilterByNotPathRegex(): void
             Psr0\BarBar::class => new ReflectionClass(Psr0\BarBar::class),
             Psr0\Foobar::class => new ReflectionClass(Psr0\Foobar::class),
             Psr4WithClassMap\BarBar::class => new ReflectionClass(Psr4WithClassMap\BarBar::class),
+            Logger4::class => new ReflectionClass(Logger4::class),
+            Logger::class => new ReflectionClass(Logger::class),
+            LoggerInterface::class => new ReflectionClass(LoggerInterface::class),
         ], iterator_to_array($finder));
     }
 
@@ -222,6 +242,9 @@ public function testFinderShouldFilterByPathCallback(): void
             Psr0\Foobar::class => new ReflectionClass(Psr0\Foobar::class),
             Psr4\SubNs\FooBaz::class => new ReflectionClass(Psr4\SubNs\FooBaz::class),
             Psr0\SubNs\FooBaz::class => new ReflectionClass(Psr0\SubNs\FooBaz::class),
+            Logger4::class => new ReflectionClass(Logger4::class),
+            Logger::class => new ReflectionClass(Logger::class),
+            LoggerInterface::class => new ReflectionClass(LoggerInterface::class),
         ], iterator_to_array($finder));
     }
 }

tests/unit/Finder/PhpDocumentorFinderTest.php

@@ -164,7 +164,7 @@ public function testFinderShouldFilterByPathCallback(): void
 
         $classes = iterator_to_array($finder);
 
-        self::assertCount(8, $classes);
+        self::assertCount(11, $classes);
         self::assertArrayHasKey(Psr4\AbstractClass::class, $classes);
         self::assertInstanceOf(Class_::class, $classes[Psr4\AbstractClass::class]);
         self::assertArrayHasKey(Psr0\Foobar::class, $classes);

tests/unit/Finder/RecursiveFinderTest.php

@@ -9,6 +9,8 @@
 use Kcs\ClassFinder\Fixtures\Psr0;
 use Kcs\ClassFinder\Fixtures\Psr4;
 use Kcs\ClassFinder\Fixtures\Recursive;
+use Logger;
+use LoggerInterface;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use SplFileInfo;
@@ -54,6 +56,8 @@ public function testFinderShouldFilterByDirectory(): void
             Psr0\BarBar::class => new ReflectionClass(Psr0\BarBar::class),
             Psr0\Foobar::class => new ReflectionClass(Psr0\Foobar::class),
             Psr0\SubNs\FooBaz::class => new ReflectionClass(Psr0\SubNs\FooBaz::class),
+            Logger::class => new ReflectionClass(Logger::class),
+            LoggerInterface::class => new ReflectionClass(LoggerInterface::class),
         ], iterator_to_array($finder));
     }