Removed proxy mode from Hyperf\Di\ClassLoader and Optimized Composer::getLoader(). (#4961)

Co-authored-by: 李铭昕 <[email protected]>

Author: assert6

src/Annotation/Scanner.php

@@ -13,11 +13,11 @@
 
 use Hyperf\Config\ProviderConfig;
 use Hyperf\Di\Aop\ProxyManager;
-use Hyperf\Di\ClassLoader;
 use Hyperf\Di\Exception\DirectoryNotExistException;
 use Hyperf\Di\MetadataCollector;
 use Hyperf\Di\ReflectionManager;
 use Hyperf\Di\ScanHandler\ScanHandlerInterface;
+use Hyperf\Utils\Composer;
 use Hyperf\Utils\Filesystem\Filesystem;
 use ReflectionClass;
 
@@ -27,7 +27,7 @@ class Scanner
 
     protected string $path = BASE_PATH . '/runtime/container/scan.cache';
 
-    public function __construct(protected ClassLoader $classloader, protected ScanConfig $scanConfig, protected ScanHandlerInterface $handler)
+    public function __construct(protected ScanConfig $scanConfig, protected ScanHandlerInterface $handler)
     {
         $this->filesystem = new Filesystem();
     }
@@ -313,7 +313,7 @@ protected function getChangedAspects(array $aspects, int $lastCacheModified): ar
             }
         }
         foreach ($classes as $class) {
-            $file = $this->classloader->getComposerClassLoader()->findFile($class);
+            $file = Composer::getLoader()->findFile($class);
             if ($file === false) {
                 echo sprintf('Skip class %s, because it does not exist in composer class loader.', $class) . PHP_EOL;
                 continue;

src/ClassLoader.php

@@ -11,7 +11,6 @@
  */
 namespace Hyperf\Di;
 
-use Composer\Autoload\ClassLoader as ComposerClassLoader;
 use Dotenv\Dotenv;
 use Dotenv\Repository\Adapter;
 use Dotenv\Repository\RepositoryBuilder;
@@ -24,34 +23,6 @@
 
 class ClassLoader
 {
-    protected ComposerClassLoader $composerClassLoader;
-
-    public function __construct(ComposerClassLoader $classLoader, string $proxyFileDir, string $configDir, ScanHandlerInterface $handler)
-    {
-        $this->setComposerClassLoader($classLoader);
-        if (file_exists(BASE_PATH . '/.env')) {
-            $this->loadDotenv();
-        }
-
-        // Scan by ScanConfig to generate the reflection class map
-        $config = ScanConfig::instance($configDir);
-        $classLoader->addClassMap($config->getClassMap());
-
-        $scanner = new Scanner($this, $config, $handler);
-        $classLoader->addClassMap(
-            $scanner->scan($classLoader->getClassMap(), $proxyFileDir)
-        );
-    }
-
-    public function loadClass(string $class): void
-    {
-        $path = $this->locateFile($class);
-
-        if ($path) {
-            include $path;
-        }
-    }
-
     public static function init(?string $proxyFileDirPath = null, ?string $configDir = null, ?ScanHandlerInterface $handler = null): void
     {
         if (! $proxyFileDirPath) {
@@ -68,50 +39,26 @@ public static function init(?string $proxyFileDirPath = null, ?string $configDir
             $handler = new PcntlScanHandler();
         }
 
-        $loaders = spl_autoload_functions();
+        $composerLoader = Composer::getLoader();
 
-        // Proxy the composer class loader
-        foreach ($loaders as &$loader) {
-            $unregisterLoader = $loader;
-            if (is_array($loader) && $loader[0] instanceof ComposerClassLoader) {
-                /** @var ComposerClassLoader $composerClassLoader */
-                $composerClassLoader = $loader[0];
-                $loader[0] = new static($composerClassLoader, $proxyFileDirPath, $configDir, $handler);
-            }
-            spl_autoload_unregister($unregisterLoader);
+        if (file_exists(BASE_PATH . '/.env')) {
+            static::loadDotenv();
         }
 
-        unset($loader);
+        // Scan by ScanConfig to generate the reflection class map
+        $config = ScanConfig::instance($configDir);
+        $composerLoader->addClassMap($config->getClassMap());
 
-        // Re-register the loaders
-        foreach ($loaders as $loader) {
-            spl_autoload_register($loader);
-        }
+        $scanner = new Scanner($config, $handler);
+        $composerLoader->addClassMap(
+            $scanner->scan($composerLoader->getClassMap(), $proxyFileDirPath)
+        );
 
         // Initialize Lazy Loader. This will prepend LazyLoader to the top of autoload queue.
         LazyLoader::bootstrap($configDir);
     }
 
-    public function setComposerClassLoader(ComposerClassLoader $classLoader): self
-    {
-        $this->composerClassLoader = $classLoader;
-        // Set the ClassLoader to Hyperf\Utils\Composer to avoid unnecessary find process.
-        Composer::setLoader($classLoader);
-        return $this;
-    }
-
-    public function getComposerClassLoader(): ComposerClassLoader
-    {
-        return $this->composerClassLoader;
-    }
-
-    protected function locateFile(string $className): ?string
-    {
-        $file = $this->getComposerClassLoader()->findFile($className);
-        return is_string($file) ? $file : null;
-    }
-
-    protected function loadDotenv(): void
+    protected static function loadDotenv(): void
     {
         $repository = RepositoryBuilder::createWithNoAdapters()
             ->addAdapter(Adapter\PutenvAdapter::class)

tests/Annotation/ScannerTest.php

@@ -15,10 +15,10 @@
 use Hyperf\Di\Annotation\AnnotationReader;
 use Hyperf\Di\Annotation\ScanConfig;
 use Hyperf\Di\Annotation\Scanner;
-use Hyperf\Di\ClassLoader;
 use Hyperf\Di\ReflectionManager;
 use Hyperf\Di\ScanHandler\NullScanHandler;
 use Hyperf\Utils\ApplicationContext;
+use Hyperf\Utils\Composer;
 use Hyperf\Utils\Filesystem\Filesystem;
 use HyperfTest\Di\Stub\AnnotationCollector;
 use HyperfTest\Di\Stub\Aspect\Debug1Aspect;
@@ -40,19 +40,22 @@ protected function tearDown(): void
         AnnotationCollector::clear();
         Mockery::close();
         ReflectionManager::clear();
+        (function () {
+            self::$classLoader = null;
+        })->call(new Composer());
     }
 
     public function testGetChangedAspects()
     {
         $this->getContainer();
-        $scanner = new Scanner($loader = Mockery::mock(ClassLoader::class), new ScanConfig(false, '/'), new NullScanHandler());
-        $loader->shouldReceive('getComposerClassLoader')->andReturnUsing(function () {
-            $loader = Mockery::mock(\Composer\Autoload\ClassLoader::class);
-            $loader->shouldReceive('findFile')->andReturnUsing(function ($class) {
-                return $class;
-            });
-            return $loader;
+
+        $loader = Mockery::mock(\Composer\Autoload\ClassLoader::class);
+        $loader->shouldReceive('findFile')->andReturnUsing(function ($class) {
+            return $class;
         });
+        Composer::setLoader($loader);
+
+        $scanner = new Scanner(new ScanConfig(false, '/'), new NullScanHandler());
         $ref = new \ReflectionClass($scanner);
         $property = $ref->getProperty('filesystem');
         $property->setAccessible(true);

tests/AnnotationTest.php

@@ -13,7 +13,6 @@
 
 use Hyperf\Di\Annotation\ScanConfig;
 use Hyperf\Di\Annotation\Scanner;
-use Hyperf\Di\ClassLoader;
 use Hyperf\Di\Exception\DirectoryNotExistException;
 use Hyperf\Di\ScanHandler\NullScanHandler;
 use Mockery;
@@ -32,7 +31,7 @@ protected function tearDown(): void
 
     public function testScanAnnotationsDirectoryNotExist()
     {
-        $scanner = new Scanner($loader = Mockery::mock(ClassLoader::class), new ScanConfig(false, '/'), new NullScanHandler());
+        $scanner = new Scanner(new ScanConfig(false, '/'), new NullScanHandler());
         $ref = new \ReflectionClass($scanner);
         $method = $ref->getMethod('normalizeDir');
         $method->setAccessible(true);
@@ -43,7 +42,7 @@ public function testScanAnnotationsDirectoryNotExist()
 
     public function testScanAnnotationsDirectoryEmpty()
     {
-        $scanner = new Scanner($loader = Mockery::mock(ClassLoader::class), new ScanConfig(false, '/'), new NullScanHandler());
+        $scanner = new Scanner(new ScanConfig(false, '/'), new NullScanHandler());
         $ref = new \ReflectionClass($scanner);
         $method = $ref->getMethod('normalizeDir');
         $method->setAccessible(true);

tests/InjectTest.php

@@ -18,7 +18,6 @@
 use Hyperf\Di\Annotation\ScanConfig;
 use Hyperf\Di\Annotation\Scanner;
 use Hyperf\Di\Aop\Ast;
-use Hyperf\Di\ClassLoader;
 use Hyperf\Di\Exception\AnnotationException;
 use Hyperf\Di\ReflectionManager;
 use Hyperf\Di\ScanHandler\NullScanHandler;
@@ -242,7 +241,7 @@ public function testInjectParentPrivateProperty()
     public function testInjectException()
     {
         try {
-            $scanner = new Scanner(Mockery::mock(ClassLoader::class), new ScanConfig(false, '/'), new NullScanHandler());
+            $scanner = new Scanner(new ScanConfig(false, '/'), new NullScanHandler());
             $reader = new AnnotationReader();
             $scanner->collect($reader, ReflectionManager::reflectClass(DemoInjectException::class));
         } catch (\Exception $e) {
@@ -271,7 +270,7 @@ protected function getContainer(array $classes = [])
             throw new Exception('The process fork failed');
         }
         if ($pid === 0) {
-            $scanner = new Scanner($loader = Mockery::mock(ClassLoader::class), new ScanConfig(false, '/'), new NullScanHandler());
+            $scanner = new Scanner(new ScanConfig(false, '/'), new NullScanHandler());
             $reader = new AnnotationReader();
 
             if (empty($classes)) {