Use iterable of ClassLoaders for ClassFinder

Author: Philipp Fritsche

src/Util/ClassFinder.php

@@ -15,18 +15,23 @@ class ClassFinder
         '+' => '(?-i:([A-Z][a-z0-9]+|[A-Z]+)_?)',
     ];
 
-    private ClassLoader $classLoader;
+    /** @var ClassLoader[] */
+    private iterable $classLoaders;
+
     private ?ConfigCache $configCache;
     private ?ClassMapGenerator $classMapGenerator;
 
     private ?array $classList;
-    
+
+    /**
+     * @param ClassLoader[] $classLoaders
+     */
     public function __construct(
-        ClassLoader $classLoader,
+        iterable $classLoaders = [],
         ConfigCache $configCache = null,
         ClassMapGenerator $classMapGenerator = null
     ) {
-        $this->classLoader = $classLoader;
+        $this->classLoaders = $classLoaders;
         $this->configCache = $configCache;
         $this->classMapGenerator = $classMapGenerator;
     }
@@ -39,32 +44,34 @@ public function getClassList()
             return $this->classList;
         }
 
-        $classes[] = $this->classLoader->getClassMap();
-        
-        if ($this->classLoader->isClassMapAuthoritative() === false) {
-            $this->classMapGenerator ??= new ClassMapGenerator();
+        foreach ($this->classLoaders as $loader) {
+            $classes[] = $loader->getClassMap();
+            
+            if ($loader->isClassMapAuthoritative() === false) {
+                $this->classMapGenerator ??= new ClassMapGenerator();
 
-            foreach ($this->classLoader->getPrefixesPsr4() as $namespace => $dirs) {
-                foreach ($dirs as $dir) {
-                    $classes[] = $this->classMapGenerator->createMap($dir, null, null, $namespace, 'psr-4');
+                foreach ($loader->getPrefixesPsr4() as $namespace => $dirs) {
+                    foreach ($dirs as $dir) {
+                        $classes[] = $this->classMapGenerator->createMap($dir, null, null, $namespace, 'psr-4');
+                    }
                 }
-            }
 
-            $dirs = $this->classLoader->getFallbackDirsPsr4();
-            foreach ($dirs as $dir) {
-                $classes[] = $this->classMapGenerator->createMap($dir, null, null, null, 'psr-4');
-            }
-            
-            $dirs = $this->classLoader->getPrefixes();
-            foreach ($this->classLoader->getPrefixes() as $namespace => $dirs) {
+                $dirs = $loader->getFallbackDirsPsr4();
                 foreach ($dirs as $dir) {
-                    $classes[] = $this->classMapGenerator->createMap($dir, null, null, $namespace, 'psr-0');
+                    $classes[] = $this->classMapGenerator->createMap($dir, null, null, null, 'psr-4');
+                }
+                
+                $dirs = $loader->getPrefixes();
+                foreach ($loader->getPrefixes() as $namespace => $dirs) {
+                    foreach ($dirs as $dir) {
+                        $classes[] = $this->classMapGenerator->createMap($dir, null, null, $namespace, 'psr-0');
+                    }
                 }
-            }
 
-            $dirs = $this->classLoader->getFallbackDirs();
-            foreach ($dirs as $dir) {
-                $classes[] = $this->classMapGenerator->createMap($dir, null, null, null, 'psr-0');
+                $dirs = $loader->getFallbackDirs();
+                foreach ($dirs as $dir) {
+                    $classes[] = $this->classMapGenerator->createMap($dir, null, null, null, 'psr-0');
+                }
             }
         }
 

src/Util/ClassFinderFactory.php

@@ -1,7 +1,6 @@
 <?php
 namespace nextdev\AdrBundle\Util;
 
-use LogicException;
 use Composer\Autoload\ClassLoader;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\HttpKernel\KernelInterface;
@@ -25,40 +24,33 @@ public function __construct(
     public function __invoke()
     {
         return new ClassFinder(
-            $this->getClassLoaderFromAutoload(),
+            $this->getClassLoadersFromAutoload(),
             $this->getCacheFromKernel()
         );
     }
 
-    protected function getClassLoaderFromAutoload(): ClassLoader
+    /**
+     * @return ClassLoader[]
+     */
+    protected function getClassLoadersFromAutoload(): array
     {
+        $loaders = [];
+        
         $autoloadStack = ($this->autoloadStack)();
 
         if (\is_array($autoloadStack)) {
-            $classLoader = \reset($autoloadStack);
-            if (\is_callable($classLoader) && \is_array($classLoader)) {
-                $classLoader = $classLoader[0];
-            }
+            foreach ($autoloadStack as $callback) {
+                if (\is_array($callback) && $callback[0] instanceof DebugClassLoader) {
+                    $callback = $callback[0]->getClassLoader();
+                }
 
-            if ($classLoader instanceof DebugClassLoader) {
-                $classLoader = $classLoader->getClassLoader();
-                if (\is_array($classLoader)) {
-                    $classLoader = $classLoader[0];
+                if (\is_array($callback) && $callback[0] instanceof ClassLoader) {
+                    $loaders[] = $callback[0];
                 }
             }
-        } else {
-            $classLoader = 'spl_autoload';
-        }
-
-        if (!$classLoader instanceof ClassLoader) {
-            throw new LogicException(\sprintf(
-                'Autoloader %s is not supported for discovering classes. %s required.',
-                \is_object($classLoader) ? \get_class($classLoader) : (string) $classLoader,
-                ClassLoader::class
-            ));
         }
 
-        return $classLoader;
+        return $loaders;
     }
 
     protected function getCacheFromKernel(): ConfigCache

test/Util/ClassFinderFactoryTest.php

@@ -29,9 +29,9 @@ function () use ($wrapLoader) {
 
         $this->assertInstanceOf(ClassFinder::class, $finder);
 
-        $loaderProp = new ReflectionProperty(ClassFinder::class, 'classLoader');
+        $loaderProp = new ReflectionProperty(ClassFinder::class, 'classLoaders');
         $loaderProp->setAccessible(true);
-        $this->assertEquals($loader, $loaderProp->getValue($finder));
+        $this->assertEquals([$loader], $loaderProp->getValue($finder));
 
         $cacheProp = new ReflectionProperty(ClassFinder::class, 'configCache');
         $cacheProp->setAccessible(true);
@@ -41,18 +41,6 @@ function () use ($wrapLoader) {
         $this->assertEquals($cacheFile, $cache->getPath());
     }
 
-    public function testExceptionOnInvalidAutoloader()
-    {
-        $factory = new ClassFinderFactory(
-            $this->getKernel('foo'),
-            fn() => false
-        );
-
-        $this->expectException(LogicException::class);
-
-        $factory();
-    }
-
     protected function getKernel(
         string $classesCacheFile,
         bool $debug = true

test/Util/ClassFinderTest.php

@@ -75,7 +75,7 @@ public function testFindClasses(
         $search,
         $expected
     ): void {
-        $finder = new ClassFinder($this->createMock(ClassLoader::class));
+        $finder = new ClassFinder();
         $classList = new ReflectionProperty(ClassFinder::class, 'classList');
         $classList->setAccessible(true);
         $classList->setValue($finder, $this->classListFixture);
@@ -108,7 +108,7 @@ public function testFindBestMatch(
         $search,
         $expected
     ): void {
-        $finder = new ClassFinder($this->createMock(ClassLoader::class));
+        $finder = new ClassFinder();
         $classList = new ReflectionProperty(ClassFinder::class, 'classList');
         $classList->setAccessible(true);
         $classList->setValue($finder, $this->classListFixture);
@@ -177,7 +177,7 @@ public static function createMap($path, $blacklist = null, $io = null, $namespac
         };
         $mapGenerator::$call = 0;
 
-        $finder = new ClassFinder($loader, null, $mapGenerator);
+        $finder = new ClassFinder([$loader], null, $mapGenerator);
 
         $this->assertEquals(\array_keys(\array_merge(...$map)), $finder->getClassList());
     }
@@ -187,9 +187,8 @@ public function testCacheClassList()
         $classes = ['foo', 'bar', 'baz'];
 
         $vfs = vfsStream::setup();
-        $classLoader = $this->createMock(ClassLoader::class);
         $cache = new ConfigCache($vfs->url() . '/test.php', true);
-        $finder = new ClassFinder($classLoader, $cache);
+        $finder = new ClassFinder([], $cache);
 
         $dumpMethod = new ReflectionMethod(ClassFinder::class, 'dumpClassList');
         $dumpMethod->setAccessible(true);
@@ -206,9 +205,8 @@ public function testCacheClassList()
     public function testExceptionOnCompromisedDumpfile()
     {
         $vfs = vfsStream::setup();
-        $classLoader = $this->createMock(ClassLoader::class);
         $cache = new ConfigCache($vfs->url() . '/test.php', true);
-        $finder = new ClassFinder($classLoader, $cache);
+        $finder = new ClassFinder([], $cache);
 
         $loadMethod = new ReflectionMethod(ClassFinder::class, 'loadClassList');
         $loadMethod->setAccessible(true);